1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small cleanup of my_default.c

Browse Source
This commit is contained in:
Sergei Golubchik 2015-01-05 18:18:33 +01:00
parent c7d9f11c8b
commit df37215efb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysys/my_default.c
View File

@ -410,14 +410,13 @@ int get_defaults_options(int argc, char **argv,
char **extra_defaults, char **extra_defaults,
char **group_suffix) char **group_suffix)
{ {
int org_argc= argc, prev_argc= 0; int org_argc= argc;
*defaults= *extra_defaults= *group_suffix= 0; *defaults= *extra_defaults= *group_suffix= 0;
while (argc >= 2 && argc != prev_argc) while (argc >= 2)
{ {
/* Skip program name or previously handled argument */ /* Skip program name or previously handled argument */
argv++; argv++;
prev_argc= argc; /* To check if we found */
if (!*defaults && is_prefix(*argv,"--defaults-file=")) if (!*defaults && is_prefix(*argv,"--defaults-file="))
{ {
*defaults= *argv + sizeof("--defaults-file=")-1; *defaults= *argv + sizeof("--defaults-file=")-1;
@ -436,6 +435,7 @@ int get_defaults_options(int argc, char **argv,
argc--; argc--;
continue; continue;
} }
break;
} }
return org_argc - argc; return org_argc - argc;
} }