osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Rename a variable to avoid collisions with a global variable, as noted 

by John Smith.

svn path=/trunk/; revision=25548
This commit is contained in:
Guy Harris 2008-06-23 20:32:50 +00:00
parent 256552f6a3
commit 6b762c78a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util.c
View File

@ -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++;

2
util.h
View File

@ -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