dir.c: coding style fix

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>

diff --git a/dir.c b/dir.c
index e65888dfad187960bf77904708e60f532ef19e1a..3068ca809a05c91e7d56f858d5e69234d3ea671c 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -557,8 +557,7 @@ int add_excludes_from_file_to_list(const char *fname,
                        buf = xrealloc(buf, size+1);
                        buf[size++] = '\n';
                }
                        buf = xrealloc(buf, size+1);
                        buf[size++] = '\n';
                }

-       }
-       else {
+       } else {

                size = xsize_t(st.st_size);
                if (size == 0) {
                        close(fd);
                size = xsize_t(st.st_size);
                if (size == 0) {
                        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) {
                if (stk->baselen <= baselen &&
                    !strncmp(dir->basebuf, base, stk->baselen))
        while ((stk = dir->exclude_stack) != NULL) {
                if (stk->baselen <= 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) {
                        cp = base;
                        current = 0;
                if (current < 0) {
                        cp = base;
                        current = 0;

-               }
-               else {
+               } else {

                        cp = strchr(base + current + 1, '/');
                        if (!cp)
                                die("oops in prep_exclude");
                        cp = strchr(base + current + 1, '/');
                        if (!cp)
                                die("oops in prep_exclude");