undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir.c: coding style fix

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-07-14 11:47:11 +02:00 committed by Junio C Hamano
parent 66f467c3e6
commit d961baa846
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dir.c
View File

@ -557,8 +557,7 @@ int add_excludes_from_file_to_list(const char *fname,
buf = xrealloc(buf, size+1); buf = xrealloc(buf, size+1);
buf[size++] = '\n'; buf[size++] = '\n';
} }
} } else {
else {
size = xsize_t(st.st_size); size = xsize_t(st.st_size);
if (size == 0) { if (size == 0) {
close(fd); close(fd);
@ -793,9 +792,11 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
group = &dir->exclude_list_group[EXC_DIRS]; group = &dir->exclude_list_group[EXC_DIRS];
/* Pop the exclude lists from the EXCL_DIRS exclude_list_group /*
* Pop the exclude lists from the EXCL_DIRS exclude_list_group
* which originate from directories not in the prefix of the * which originate from directories not in the prefix of the
* path being checked. */ * path being checked.
*/
while ((stk = dir->exclude_stack) != NULL) { while ((stk = dir->exclude_stack) != NULL) {
if (stk->baselen <= baselen && if (stk->baselen <= baselen &&
!strncmp(dir->basebuf, base, stk->baselen)) !strncmp(dir->basebuf, base, stk->baselen))
@ -822,8 +823,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
if (current < 0) { if (current < 0) {
cp = base; cp = base;
current = 0; current = 0;
} } else {
else {
cp = strchr(base + current + 1, '/'); cp = strchr(base + current + 1, '/');
if (!cp) if (!cp)
die("oops in prep_exclude"); die("oops in prep_exclude");