diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
| commit | 7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch) | |
| tree | cc09f739029479eee683f26228e098db307fd1aa /ui/export_object.c | |
| parent | f8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff) | |
Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).
svn path=/trunk/; revision=46402
Diffstat (limited to 'ui/export_object.c')
| -rw-r--r-- | ui/export_object.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/export_object.c b/ui/export_object.c index a85a0a2b46..5a07651075 100644 --- a/ui/export_object.c +++ b/ui/export_object.c @@ -114,14 +114,14 @@ eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry, gbool #define HEXTOASCII(x) (((x) < 10) ? ((x) + '0') : ((x) - 10 + 'a')) #define MAXFILELEN 255 -static GString *eo_rename(GString *gstr, int dup) +static GString *eo_rename(GString *gstr, int dupn) { GString *gstr_tmp; gchar *tmp_ptr; GString *ext_str; gstr_tmp = g_string_new("("); - g_string_append_printf (gstr_tmp, "%d)", dup); + g_string_append_printf (gstr_tmp, "%d)", dupn); if ( (tmp_ptr = strrchr(gstr->str, '.')) != NULL ) { /* Retain the extension */ ext_str = g_string_new(tmp_ptr); @@ -142,7 +142,7 @@ static GString *eo_rename(GString *gstr, int dup) } GString * -eo_massage_str(const gchar *in_str, gsize maxlen, int dup) +eo_massage_str(const gchar *in_str, gsize maxlen, int dupn) { gchar *tmp_ptr; /* The characters in "reject" come from: @@ -178,8 +178,8 @@ eo_massage_str(const gchar *in_str, gsize maxlen, int dup) else out_str = g_string_truncate(out_str, maxlen); } - if ( dup != 0 ) - out_str = eo_rename(out_str, dup); + if ( dupn != 0 ) + out_str = eo_rename(out_str, dupn); return out_str; } |