diff options
| author | Eric Blake <ebb9@byu.net> | 2008-05-01 12:05:03 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-05-01 12:05:03 -0600 |
| commit | 1dd98ea10e065300cfa110b7305362c1f12ed00f (patch) | |
| tree | c621ad17afe28d9e09bdc9c4e1ad12a4b720985c /modules/m4.c | |
| parent | 6abccf89a8f468530209cf5b2f6178ab343af2a4 (diff) | |
| download | m4-1dd98ea10e065300cfa110b7305362c1f12ed00f.tar.gz | |
Avoid -Wshadow compiler warnings.
* m4/output.c (threshold_diversion_CB): s/div/diversion/.
* m4/macro.c (make_argv_ref, arg_symbol, m4_arg_symbol)
(m4_is_arg_text, m4_is_arg_func, m4_arg_text, m4_arg_empty)
(m4_arg_len, m4_arg_func, m4__arg_print, m4_make_argv_ref)
(m4_push_arg, m4__push_arg_quote): s/index/arg/.
* modules/format.c (format): Likewise.
* modules/m4.c (ifelse): Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'modules/m4.c')
| -rw-r--r-- | modules/m4.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/m4.c b/modules/m4.c index b8562ec2..0b714efa 100644 --- a/modules/m4.c +++ b/modules/m4.c @@ -210,7 +210,7 @@ M4BUILTIN_HANDLER (ifdef) M4BUILTIN_HANDLER (ifelse) { const char *me = M4ARG (0); - size_t index; + size_t i; /* The valid ranges of argc for ifelse is discontinuous, we cannot rely on the regular mechanisms. */ @@ -220,14 +220,14 @@ M4BUILTIN_HANDLER (ifelse) /* Diagnose excess arguments if 5, 8, 11, etc., actual arguments. */ m4_bad_argc (context, argc, me, 0, argc - 2, false); - index = 1; + i = 1; argc--; while (true) { - if (m4_arg_equal (context, argv, index, index + 1)) + if (m4_arg_equal (context, argv, i, i + 1)) { - m4_push_arg (context, obs, argv, index + 2); + m4_push_arg (context, obs, argv, i + 2); return; } switch (argc) @@ -237,12 +237,12 @@ M4BUILTIN_HANDLER (ifelse) case 4: case 5: - m4_push_arg (context, obs, argv, index + 3); + m4_push_arg (context, obs, argv, i + 3); return; default: argc -= 3; - index += 3; + i += 3; } } } |