mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

(mc_search_set_error): cleanup compile warning on older gcc compilers:

Browse Source 
search.c: In function 'mc_search_set_error':
search.c:497:36: error: declaration of 'mc_search' shadows a global declaration [-Werror=shadow]
search.c:419:1: error: shadowed declaration is here [-Werror=shadow]

Signed-off-by: Andreas Mohr <and@gmx.li>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andreas Mohr 2016-05-28 09:40:49 +00:00 committed by Andrew Borodin
parent bb782ad8ef
commit e4badcf7bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/search.h
View File

@ -168,7 +168,7 @@ int mc_search_getstart_result_by_num (mc_search_t *, int);
int mc_search_getend_result_by_num (mc_search_t *, int); int mc_search_getend_result_by_num (mc_search_t *, int);
/* *INDENT-OFF* */ /* *INDENT-OFF* */
void mc_search_set_error (mc_search_t * mc_search, mc_search_error_t code, const gchar * format, ...) void mc_search_set_error (mc_search_t * lc_mc_search, mc_search_error_t code, const gchar * format, ...)
G_GNUC_PRINTF (3, 4); G_GNUC_PRINTF (3, 4);
/* *INDENT-ON* */ /* *INDENT-ON* */

8
lib/search/search.c
View File

@ -494,18 +494,18 @@ mc_search_getend_result_by_num (mc_search_t * lc_mc_search, int lc_index)
*/ */
void void
mc_search_set_error (mc_search_t * mc_search, mc_search_error_t code, const gchar * format, ...) mc_search_set_error (mc_search_t * lc_mc_search, mc_search_error_t code, const gchar * format, ...)
{ {
mc_search->error = code; lc_mc_search->error = code;
MC_PTR_FREE (mc_search->error_str); MC_PTR_FREE (lc_mc_search->error_str);
if (format != NULL) if (format != NULL)
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
mc_search->error_str = g_strdup_vprintf (format, args); lc_mc_search->error_str = g_strdup_vprintf (format, args);
va_end (args); va_end (args);
} }
} }