diff options
author | Bernhard R. Link <brlink@debian.org> | 2009-07-15 17:30:31 +0200 |
---|---|---|
committer | Bernhard R. Link <brlink@debian.org> | 2009-07-15 17:30:31 +0200 |
commit | ad06f3519881bd3b2d5b8a3f1880a6768a530e2a (patch) | |
tree | 5c0aa16782cc0e2463ab3fafccd9e460afbc57da /src/main.c | |
parent | 7bdee1c7f38befd9b6b0b5805dd0824fe2233936 (diff) | |
download | ratpoison-ad06f3519881bd3b2d5b8a3f1880a6768a530e2a.zip |
do not shadow identifiers (silencing gcc's -Wshadow warnings)
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -574,7 +574,7 @@ main (int argc, char *argv[]) { int i; int c; - char **command = NULL; + char **cmd = NULL; int cmd_count = 0; int screen_arg = 0; int screen_num = 0; @@ -602,17 +602,17 @@ main (int argc, char *argv[]) print_version (); break; case 'c': - if (!command) + if (!cmd) { - command = xmalloc (sizeof(char *)); + cmd = xmalloc (sizeof(char *)); cmd_count = 0; } else { - command = xrealloc (command, sizeof (char *) * (cmd_count + 1)); + cmd = xrealloc (cmd, sizeof (char *) * (cmd_count + 1)); } - command[cmd_count] = xstrdup (optarg); + cmd[cmd_count] = xstrdup (optarg); cmd_count++; break; case 'd': @@ -658,19 +658,19 @@ main (int argc, char *argv[]) if (cmd_count > 0) { - int i; + int j; - for (i=0; i<cmd_count; i++) + for (j=0; j<cmd_count; j++) { if (screen_arg) - send_command (interactive, (unsigned char *)command[i], screen_num); + send_command (interactive, (unsigned char *)cmd[j], screen_num); else - send_command (interactive, (unsigned char *)command[i], -1); + send_command (interactive, (unsigned char *)cmd[j], -1); - free (command[i]); + free (cmd[j]); } - free (command); + free (cmd); XCloseDisplay (dpy); return EXIT_SUCCESS; } |