Ticket #3547: mc-3547-cleanup-conversion-warning-mc_search_new.patch
File mc-3547-cleanup-conversion-warning-mc_search_new.patch, 13.2 KB (added by and, 8 years ago) |
---|
-
lib/filehighlight/ini-file-read.c
fix -Wconversion warning for mc_search_new() mc_search_new() parameter orignial_len use once only factor out into own function mc_search_new_len() patch will fix following warnings: ini-file-read.c:116:58: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] search.c:418:38: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] ext.c:726:38: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] ext.c:915:44: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] filegui.c:1306:58: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] find.c:406:32: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] find.c:1626:61: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] find.c:1637:55: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] panel.c:2059:38: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] panel.c:2527:38: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] panel.c:2647:38: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] config_parser.c:216:56: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] config_parser.c:259:63: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] config_parser.c:407:57: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] actions_cmd.c:150:69: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] dialogs.c:145:61: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] editcmd.c:1229:39: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] editcmd.c:2570:47: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] editcmd.c:2792:69: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] editcmd_dialogs.c:166:61: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] search.c:254:70: warning: implicit conversion changes signedness: 'int' to 'gsize' (aka 'unsigned long') [-Wsign-conversion] patch against a5cd0093c5330ae6118cbf2830cf288dd4a68ed0 + previous patches compile test with gcc 4.6/4.9/5.2 and clang 3.7 Signed-off-by: Andreas Mohr <and@gmx.li>
a b 113 113 114 114 mc_filter = g_new0 (mc_fhl_filter_t, 1); 115 115 mc_filter->type = MC_FLHGH_T_FREGEXP; 116 mc_filter->search_condition = mc_search_new (regexp, -1,DEFAULT_CHARSET);116 mc_filter->search_condition = mc_search_new (regexp, DEFAULT_CHARSET); 117 117 mc_filter->search_condition->is_case_sensitive = TRUE; 118 118 mc_filter->search_condition->search_type = MC_SEARCH_T_REGEX; 119 119 … … 158 158 159 159 mc_filter = g_new0 (mc_fhl_filter_t, 1); 160 160 mc_filter->type = MC_FLHGH_T_FREGEXP; 161 mc_filter->search_condition = mc_search_new (buf->str, buf->len, DEFAULT_CHARSET);161 mc_filter->search_condition = mc_search_new_len (buf->str, buf->len, DEFAULT_CHARSET); 162 162 mc_filter->search_condition->is_case_sensitive = 163 163 mc_config_get_bool (fhl->config, group_name, "extensions_case", TRUE); 164 164 mc_filter->search_condition->search_type = MC_SEARCH_T_REGEX; -
lib/search/search.c
a b 134 134 */ 135 135 136 136 mc_search_t * 137 mc_search_new (const gchar * original, gsize original_len, const gchar * original_charset) 137 mc_search_new (const gchar * original, const gchar * original_charset) 138 { 139 if (original == NULL) 140 return NULL; 141 return mc_search_new_len (original, strlen (original), original_charset); 142 } 143 mc_search_t * 144 mc_search_new_len (const gchar * original, gsize original_len, const gchar * original_charset) 138 145 { 139 146 mc_search_t *lc_mc_search; 140 147 141 148 if (original == NULL) 142 149 return NULL; 143 150 144 if ((gssize) original_len == -1) 145 { 146 original_len = strlen (original); 147 if (original_len == 0) 148 return NULL; 149 } 151 if (original_len == 0) 152 return NULL; 150 153 151 154 lc_mc_search = g_new0 (mc_search_t, 1); 152 155 lc_mc_search->original = g_strndup (original, original_len); … … 415 418 if (str == NULL) 416 419 return FALSE; 417 420 418 search = mc_search_new (pattern, -1,pattern_charset);421 search = mc_search_new (pattern, pattern_charset); 419 422 if (search == NULL) 420 423 return FALSE; 421 424 -
lib/search.h
a b 129 129 130 130 /*** declarations of public functions ************************************************************/ 131 131 132 mc_search_t *mc_search_new (const gchar * original, gsize original_len, 132 mc_search_t *mc_search_new (const gchar * original, const gchar * original_charset); 133 134 mc_search_t *mc_search_new_len (const gchar * original, gsize original_len, 133 135 const gchar * original_charset); 134 136 135 137 void mc_search_free (mc_search_t * lc_mc_search); -
src/diffviewer/search.c
a b 251 251 252 252 mc_search_free (dview->search.handle); 253 253 #ifdef HAVE_CHARSET 254 dview->search.handle = mc_search_new (dview->search.last_string, -1,cp_source);254 dview->search.handle = mc_search_new (dview->search.last_string, cp_source); 255 255 #else 256 dview->search.handle = mc_search_new (dview->search.last_string, -1,NULL);256 dview->search.handle = mc_search_new (dview->search.last_string, NULL); 257 257 #endif 258 258 259 259 if (dview->search.handle == NULL) -
src/editor/editcmd.c
a b 1226 1226 edit_search_status_msg_t esm; 1227 1227 1228 1228 #ifdef HAVE_CHARSET 1229 srch = mc_search_new (match_expr, -1,cp_source);1229 srch = mc_search_new (match_expr, cp_source); 1230 1230 #else 1231 srch = mc_search_new (match_expr, -1,NULL);1231 srch = mc_search_new (match_expr, NULL); 1232 1232 #endif 1233 1233 if (srch == NULL) 1234 1234 return 0; … … 2567 2567 if (edit->search == NULL) 2568 2568 { 2569 2569 #ifdef HAVE_CHARSET 2570 edit->search = mc_search_new (input1, -1,cp_source);2570 edit->search = mc_search_new (input1, cp_source); 2571 2571 #else 2572 edit->search = mc_search_new (input1, -1,NULL);2572 edit->search = mc_search_new (input1, NULL); 2573 2573 #endif 2574 2574 if (edit->search == NULL) 2575 2575 { … … 2789 2789 g_list_free_full (history, g_free); 2790 2790 2791 2791 #ifdef HAVE_CHARSET 2792 edit->search = mc_search_new (edit->last_search_string, -1,cp_source);2792 edit->search = mc_search_new (edit->last_search_string, cp_source); 2793 2793 #else 2794 edit->search = mc_search_new (edit->last_search_string, -1,NULL);2794 edit->search = mc_search_new (edit->last_search_string, NULL); 2795 2795 #endif 2796 2796 if (edit->search == NULL) 2797 2797 { -
src/editor/editcmd_dialogs.c
a b 163 163 mc_search_free (edit->search); 164 164 165 165 #ifdef HAVE_CHARSET 166 edit->search = mc_search_new (edit->last_search_string, -1,cp_source);166 edit->search = mc_search_new (edit->last_search_string, cp_source); 167 167 #else 168 edit->search = mc_search_new (edit->last_search_string, -1,NULL);168 edit->search = mc_search_new (edit->last_search_string, NULL); 169 169 #endif 170 170 if (edit->search != NULL) 171 171 { -
src/filemanager/ext.c
a b 723 723 { 724 724 mc_search_t *search; 725 725 726 search = mc_search_new (ptr, -1,DEFAULT_CHARSET);726 search = mc_search_new (ptr, DEFAULT_CHARSET); 727 727 if (search != NULL) 728 728 { 729 729 search->search_type = MC_SEARCH_T_REGEX; … … 912 912 if (case_insense) 913 913 p += 2; 914 914 915 search = mc_search_new (p, -1,DEFAULT_CHARSET);915 search = mc_search_new (p, DEFAULT_CHARSET); 916 916 if (search != NULL) 917 917 { 918 918 search->search_type = MC_SEARCH_T_REGEX; -
src/filemanager/filegui.c
a b 1303 1303 return dest_dir; 1304 1304 } 1305 1305 1306 ctx->search_handle = mc_search_new (source_mask, -1,NULL);1306 ctx->search_handle = mc_search_new (source_mask, NULL); 1307 1307 1308 1308 if (ctx->search_handle == NULL) 1309 1309 { -
src/filemanager/find.c
a b 403 403 mc_search_t *search; 404 404 gboolean regexp_ok = FALSE; 405 405 406 search = mc_search_new (r, -1,NULL);406 search = mc_search_new (r, NULL); 407 407 408 408 if (search != NULL) 409 409 { … … 1623 1623 { 1624 1624 int ret; 1625 1625 1626 search_content_handle = mc_search_new (content_pattern, -1,NULL);1626 search_content_handle = mc_search_new (content_pattern, NULL); 1627 1627 if (search_content_handle) 1628 1628 { 1629 1629 search_content_handle->search_type = … … 1634 1634 search_content_handle->is_all_charsets = options.content_all_charsets; 1635 1635 #endif 1636 1636 } 1637 search_file_handle = mc_search_new (find_pattern, -1,NULL);1637 search_file_handle = mc_search_new (find_pattern, NULL); 1638 1638 search_file_handle->search_type = options.file_pattern ? MC_SEARCH_T_GLOB : MC_SEARCH_T_REGEX; 1639 1639 search_file_handle->is_case_sensitive = options.file_case_sens; 1640 1640 #ifdef HAVE_CHARSET -
src/filemanager/panel.c
a b 2056 2056 2057 2057 g_free (cur_file_ext); 2058 2058 2059 search = mc_search_new (reg_exp, -1,NULL);2059 search = mc_search_new (reg_exp, NULL); 2060 2060 search->search_type = MC_SEARCH_T_REGEX; 2061 2061 search->is_case_sensitive = FALSE; 2062 2062 … … 2524 2524 return; 2525 2525 } 2526 2526 2527 search = mc_search_new (reg_exp, -1,NULL);2527 search = mc_search_new (reg_exp, NULL); 2528 2528 search->search_type = (shell_patterns != 0) ? MC_SEARCH_T_GLOB : MC_SEARCH_T_REGEX; 2529 2529 search->is_entire_line = TRUE; 2530 2530 search->is_case_sensitive = case_sens != 0; … … 2644 2644 2645 2645 reg_exp = g_strdup_printf ("%s*", panel->search_buffer); 2646 2646 esc_str = strutils_escape (reg_exp, ",|\\{}[]", TRUE); 2647 search = mc_search_new (esc_str, -1,NULL);2647 search = mc_search_new (esc_str, NULL); 2648 2648 search->search_type = MC_SEARCH_T_GLOB; 2649 2649 search->is_entire_line = TRUE; 2650 2650 -
src/vfs/sftpfs/config_parser.c
a b 213 213 214 214 mc_return_val_if_error (mcerror, FALSE); 215 215 216 host_regexp = mc_search_new ("^\\s*host\\s+(.*)$", -1,DEFAULT_CHARSET);216 host_regexp = mc_search_new ("^\\s*host\\s+(.*)$", DEFAULT_CHARSET); 217 217 host_regexp->search_type = MC_SEARCH_T_REGEX; 218 218 host_regexp->is_case_sensitive = FALSE; 219 219 … … 256 256 { 257 257 mc_search_t *pattern_regexp; 258 258 259 pattern_regexp = mc_search_new (host_pattern, -1,DEFAULT_CHARSET);259 pattern_regexp = mc_search_new (host_pattern, DEFAULT_CHARSET); 260 260 pattern_regexp->search_type = MC_SEARCH_T_GLOB; 261 261 pattern_regexp->is_case_sensitive = FALSE; 262 262 pattern_regexp->is_entire_line = TRUE; … … 404 404 for (i = 0; config_variables[i].pattern != NULL; i++) 405 405 { 406 406 config_variables[i].pattern_regexp = 407 mc_search_new (config_variables[i].pattern, -1,DEFAULT_CHARSET);407 mc_search_new (config_variables[i].pattern, DEFAULT_CHARSET); 408 408 config_variables[i].pattern_regexp->search_type = MC_SEARCH_T_REGEX; 409 409 config_variables[i].pattern_regexp->is_case_sensitive = FALSE; 410 410 config_variables[i].offset = structure_offsets[i]; -
src/viewer/actions_cmd.c
a b 147 147 g_list_free_full (history, g_free); 148 148 149 149 #ifdef HAVE_CHARSET 150 view->search = mc_search_new (view->last_search_string, -1,cp_source);150 view->search = mc_search_new (view->last_search_string, cp_source); 151 151 #else 152 view->search = mc_search_new (view->last_search_string, -1,NULL);152 view->search = mc_search_new (view->last_search_string, NULL); 153 153 #endif 154 154 view->search_nroff_seq = mcview_nroff_seq_new (view); 155 155 -
src/viewer/dialogs.c
a b 142 142 mc_search_free (view->search); 143 143 144 144 #ifdef HAVE_CHARSET 145 view->search = mc_search_new (view->last_search_string, -1,cp_source);145 view->search = mc_search_new (view->last_search_string, cp_source); 146 146 #else 147 view->search = mc_search_new (view->last_search_string, -1,NULL);147 view->search = mc_search_new (view->last_search_string, NULL); 148 148 #endif 149 149 view->search_nroff_seq = mcview_nroff_seq_new (view); 150 150 if (view->search != NULL) -
tests/lib/search/glob_prepare_replace_str.c
a b 71 71 mc_search_t *s; 72 72 char *dest_str; 73 73 74 s = mc_search_new (data->glob_str, -1,NULL);74 s = mc_search_new (data->glob_str, NULL); 75 75 s->is_case_sensitive = TRUE; 76 76 s->search_type = MC_SEARCH_T_GLOB; 77 77