@matheusbsbs / matheus-bagliano / commits / edb6ddc53e
Fork 0

remove unused/unneeded "pattern" argument of list_commands

list_commands() currently accepts and ignores a "pattern" argument, and then hard codes a prefix as well as some magic numbers. This hardcodes the prefix inside of the function and removes the magic numbers. Signed-off-by: Scott R Parish <srp@srparish.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Scott R Parish committed Oct 27, 2007 at 01:36 UTC edb6ddc53e71f4f959665cbc3180bb21b7ee7634
1 file changed +8 -6
help.c
+8 -6
@@ -93,10 +93,12 @@ static void pretty_print_string_list(struct cmdname **cmdname, int longest)
93 }
94 }
95
96 -static void list_commands(const char *exec_path, const char *pattern)
96 +static void list_commands(const char *exec_path)
97 {
98 unsigned int longest = 0;
99 char path[PATH_MAX];
100 + const char *prefix = "git-";
101 + int prefix_len = strlen(prefix);
102 int dirlen;
103 DIR *dir = opendir(exec_path);
104 struct dirent *de;
@@ -120,7 +122,7 @@ static void list_commands(const char *exec_path, const char *pattern)
122 struct stat st;
123 int entlen;
124
123 - if (prefixcmp(de->d_name, "git-"))
125 + if (prefixcmp(de->d_name, prefix))
126 continue;
127 strcpy(path+dirlen, de->d_name);
128 if (stat(path, &st) || /* stat, not lstat */
@@ -128,14 +130,14 @@ static void list_commands(const char *exec_path, const char *pattern)
130 !(st.st_mode & S_IXUSR))
131 continue;
132
131 - entlen = strlen(de->d_name);
133 + entlen = strlen(de->d_name) - prefix_len;
134 if (has_extension(de->d_name, ".exe"))
135 entlen -= 4;
136
137 if (longest < entlen)
138 longest = entlen;
139
138 - add_cmdname(de->d_name + 4, entlen-4);
140 + add_cmdname(de->d_name + prefix_len, entlen);
141 }
142 closedir(dir);
143
@@ -143,7 +145,7 @@ static void list_commands(const char *exec_path, const char *pattern)
145 printf("----------------------------");
146 mput_char('-', strlen(exec_path));
147 putchar('\n');
146 - pretty_print_string_list(cmdname, longest - 4);
148 + pretty_print_string_list(cmdname, longest);
149 putchar('\n');
150 }
151
@@ -209,7 +211,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
211 else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) {
212 printf("usage: %s\n\n", git_usage_string);
213 if(exec_path)
212 - list_commands(exec_path, "git-*");
214 + list_commands(exec_path);
215 exit(0);
216 }
217