summaryrefslogtreecommitdiff
path: root/mysys/my_default.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-01-05 18:18:33 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-10 10:21:15 +0100
commitdf37215efb698e46368db2581197758732cf17d3 (patch)
tree394700b1fc7fe9b888dd6678f8def9358a5224e2 /mysys/my_default.c
parentc7d9f11c8b1fd1557af4387eb4b3ab660b137537 (diff)
downloadmariadb-git-df37215efb698e46368db2581197758732cf17d3.tar.gz
small cleanup of my_default.c
Diffstat (limited to 'mysys/my_default.c')
-rw-r--r--mysys/my_default.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c
index 0bd76a1cff0..87258a3b27e 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -410,14 +410,13 @@ int get_defaults_options(int argc, char **argv,
char **extra_defaults,
char **group_suffix)
{
- int org_argc= argc, prev_argc= 0;
+ int org_argc= argc;
*defaults= *extra_defaults= *group_suffix= 0;
- while (argc >= 2 && argc != prev_argc)
+ while (argc >= 2)
{
/* Skip program name or previously handled argument */
argv++;
- prev_argc= argc; /* To check if we found */
if (!*defaults && is_prefix(*argv,"--defaults-file="))
{
*defaults= *argv + sizeof("--defaults-file=")-1;
@@ -436,6 +435,7 @@ int get_defaults_options(int argc, char **argv,
argc--;
continue;
}
+ break;
}
return org_argc - argc;
}