From 4bb0eddb89e3e5c305954bd2b66e82d277509dcf Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 13:16:40 +0000
Subject: [PATCH] editor/editcmd.c: cleanup some -Wcast-qual warnings
editcmd.c:2535:70: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
disp1 = edit_replace_cmd__conv_to_display (saved1 ? saved1 : (char *) "");
^
editcmd.c:2536:70: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
disp2 = edit_replace_cmd__conv_to_display (saved2 ? saved2 : (char *) "");
^
editcmd.c:2747:20: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
WEdit *edit = ((edit_search_status_msg_t *) user_data)->edit;
^
Signed-off-by: Andreas Mohr <and@gmx.li>
---
lib/charsets.c | 4 ++--
lib/charsets.h | 4 ++--
src/editor/editcmd.c | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/charsets.c b/lib/charsets.c
index 93d87b2..95c4f61 100644
a
|
b
|
convert_to_display (char *str) |
354 | 354 | /* --------------------------------------------------------------------------------------------- */ |
355 | 355 | |
356 | 356 | GString * |
357 | | str_convert_to_display (char *str) |
| 357 | str_convert_to_display (const char *str) |
358 | 358 | { |
359 | 359 | return str_nconvert_to_display (str, -1); |
360 | 360 | |
… |
… |
str_convert_to_display (char *str) |
363 | 363 | /* --------------------------------------------------------------------------------------------- */ |
364 | 364 | |
365 | 365 | GString * |
366 | | str_nconvert_to_display (char *str, int len) |
| 366 | str_nconvert_to_display (const char *str, int len) |
367 | 367 | { |
368 | 368 | GString *buff; |
369 | 369 | GIConv conv; |
diff --git a/lib/charsets.h b/lib/charsets.h
index 2b95d8f..2e6b6c5 100644
a
|
b
|
int convert_from_8bit_to_utf_c2 (const char input_char); |
69 | 69 | GString *str_convert_to_input (char *str); |
70 | 70 | GString *str_nconvert_to_input (char *str, int len); |
71 | 71 | |
72 | | GString *str_convert_to_display (char *str); |
73 | | GString *str_nconvert_to_display (char *str, int len); |
| 72 | GString *str_convert_to_display (const char *str); |
| 73 | GString *str_nconvert_to_display (const char *str, int len); |
74 | 74 | |
75 | 75 | /*** inline functions ****************************************************************************/ |
76 | 76 | |
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 0d2d6e1..99c2803 100644
a
|
b
|
editcmd_find (edit_search_status_msg_t * esm, gsize * len) |
909 | 909 | /* --------------------------------------------------------------------------------------------- */ |
910 | 910 | |
911 | 911 | static char * |
912 | | edit_replace_cmd__conv_to_display (char *str) |
| 912 | edit_replace_cmd__conv_to_display (const char *str) |
913 | 913 | { |
914 | 914 | #ifdef HAVE_CHARSET |
915 | 915 | GString *tmp; |
… |
… |
edit_replace_cmd (WEdit * edit, int again) |
2532 | 2532 | { |
2533 | 2533 | char *tmp_inp1, *tmp_inp2; |
2534 | 2534 | |
2535 | | disp1 = edit_replace_cmd__conv_to_display (saved1 ? saved1 : (char *) ""); |
2536 | | disp2 = edit_replace_cmd__conv_to_display (saved2 ? saved2 : (char *) ""); |
| 2535 | disp1 = edit_replace_cmd__conv_to_display (saved1 ? saved1 : ""); |
| 2536 | disp2 = edit_replace_cmd__conv_to_display (saved2 ? saved2 : ""); |
2537 | 2537 | |
2538 | 2538 | edit_push_undo_action (edit, KEY_PRESS + edit->start_display); |
2539 | 2539 | |
… |
… |
edit_replace_cmd (WEdit * edit, int again) |
2744 | 2744 | mc_search_cbret_t |
2745 | 2745 | edit_search_cmd_callback (const void *user_data, gsize char_offset, int *current_char) |
2746 | 2746 | { |
2747 | | WEdit *edit = ((edit_search_status_msg_t *) user_data)->edit; |
| 2747 | WEdit *edit = ((const edit_search_status_msg_t *) user_data)->edit; |
2748 | 2748 | |
2749 | 2749 | *current_char = edit_buffer_get_byte (&edit->buffer, (off_t) char_offset); |
2750 | 2750 | return MC_SEARCH_CB_OK; |