Moved a variable in glob_expand_one().

diff --git a/util.c b/util.c
index e99ede8..9ebd6ba 100644 (file)
--- a/util.c
+++ b/util.c
@@ -528,7 +528,6 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
        filter_server_path(s);
 #else
        glob_t globbuf;
        filter_server_path(s);
 #else
        glob_t globbuf;

-       int i;

 
        if (maxargs <= argc)
                return;
 
        if (maxargs <= argc)
                return;


@@ -553,9 +552,9 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
        if (globbuf.gl_pathc == 0)
                argv[argc++] = s;
        else {
        if (globbuf.gl_pathc == 0)
                argv[argc++] = s;
        else {

-               int j = globbuf.gl_pathc;
+               int i;

                free(s);
                free(s);

-               for (i = 0; i < j; i++) {
+               for (i = 0; i < (int)globbuf.gl_pathc; i++) {

                        if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
                                out_of_memory("glob_expand_one");
                }
                        if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
                                out_of_memory("glob_expand_one");
                }