Ticket #3598: mc-3598-0022-editor-editcmd.c-cleanup-some-Wcast-qual-warning.patch

File mc-3598-0022-editor-editcmd.c-cleanup-some-Wcast-qual-warning.patch, 3.8 KB (added by and, 8 years ago)

  • lib/charsets.c 

    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) 
    354354/* --------------------------------------------------------------------------------------------- */ 
    355355 
    356356GString * 
    357 str_convert_to_display (char *str) 
     357str_convert_to_display (const char *str) 
    358358{ 
    359359    return str_nconvert_to_display (str, -1); 
    360360 
    … … str_convert_to_display (char *str) 
    363363/* --------------------------------------------------------------------------------------------- */ 
    364364 
    365365GString * 
    366 str_nconvert_to_display (char *str, int len) 
     366str_nconvert_to_display (const char *str, int len) 
    367367{ 
    368368    GString *buff; 
    369369    GIConv conv; 

  • lib/charsets.h 

    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); 
    6969GString *str_convert_to_input (char *str); 
    7070GString *str_nconvert_to_input (char *str, int len); 
    7171 
    72 GString *str_convert_to_display (char *str); 
    73 GString *str_nconvert_to_display (char *str, int len); 
     72GString *str_convert_to_display (const char *str); 
     73GString *str_nconvert_to_display (const char *str, int len); 
    7474 
    7575/*** inline functions ****************************************************************************/ 
    7676 

  • src/editor/editcmd.c 

    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) 
    909909/* --------------------------------------------------------------------------------------------- */ 
    910910 
    911911static char * 
    912 edit_replace_cmd__conv_to_display (char *str) 
     912edit_replace_cmd__conv_to_display (const char *str) 
    913913{ 
    914914#ifdef HAVE_CHARSET 
    915915    GString *tmp; 
    … … edit_replace_cmd (WEdit * edit, int again) 
    25322532    { 
    25332533        char *tmp_inp1, *tmp_inp2; 
    25342534 
    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 : ""); 
    25372537 
    25382538        edit_push_undo_action (edit, KEY_PRESS + edit->start_display); 
    25392539 
    … … edit_replace_cmd (WEdit * edit, int again) 
    27442744mc_search_cbret_t 
    27452745edit_search_cmd_callback (const void *user_data, gsize char_offset, int *current_char) 
    27462746{ 
    2747     WEdit *edit = ((edit_search_status_msg_t *) user_data)->edit; 
     2747    WEdit *edit = ((const edit_search_status_msg_t *) user_data)->edit; 
    27482748 
    27492749    *current_char = edit_buffer_get_byte (&edit->buffer, (off_t) char_offset); 
    27502750    return MC_SEARCH_CB_OK;