From 6b762c78a500d44eb87db3e621b3efef3b50846c Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 23 Jun 2008 20:32:50 +0000 Subject: Rename a variable to avoid collisions with a global variable, as noted by John Smith. svn path=/trunk/; revision=25548 --- util.c | 6 +++--- util.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util.c b/util.c index 1b466cf098..5d25e43620 100644 --- a/util.c +++ b/util.c @@ -48,7 +48,7 @@ * separated by spaces. */ char * -get_args_as_string(int argc, char **argv, int optind) +get_args_as_string(int argc, char **argv, int optindex) { int len; int i; @@ -58,7 +58,7 @@ get_args_as_string(int argc, char **argv, int optind) * Find out how long the string will be. */ len = 0; - for (i = optind; i < argc; i++) { + for (i = optindex; i < argc; i++) { len += strlen(argv[i]); len++; /* space, or '\0' if this is the last argument */ } @@ -72,7 +72,7 @@ get_args_as_string(int argc, char **argv, int optind) * Now construct the string. */ argstring[0] = '\0'; - i = optind; + i = optindex; for (;;) { g_strlcat(argstring, argv[i], len); i++; diff --git a/util.h b/util.h index 4a9d811126..2849b05cd6 100644 --- a/util.h +++ b/util.h @@ -32,7 +32,7 @@ extern "C" { /* Collect command-line arguments as a string consisting of the arguments, * separated by spaces. */ -char *get_args_as_string(int argc, char **argv, int optind); +char *get_args_as_string(int argc, char **argv, int optindex); /* Compute the difference between two seconds/microseconds time stamps. * Beware: we're using nanosecond resolution now and function is currently unused -- cgit v1.2.3