Ticket #3598: mc-3598-0027-diffviewer-ydiff.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0027-diffviewer-ydiff.c-cleanup-Wcast-qual-warning.patch, 4.9 KB (added by and, 8 years ago)

  • src/diffviewer/ydiff.c 

    From 52131d4bccc42cdea1ced0dddad20cbf17eeebbd Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 12:58:38 +0000
Subject: [PATCH] diffviewer/ydiff.c: cleanup -Wcast-qual warning

ydiff.c:1420:39: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
                 (void) dview_get_utf ((char *) src, &ch_len, &res);
                                       ^
ydiff.c:1523:39: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
                 (void) dview_get_utf ((char *) src, &ch_len, &res);
                                       ^
ydiff.c:2798:47: warning: to be safe all intermediate pointers in cast from 'GArray ** {aka struct _GArray **}' to 'const GArray ** {aka const struct _GArray **}' must be 'const' qualified [-Wcast-qual]
         dview->display_numbers = calc_nwidth ((const GArray **) dview->a);
                                               ^
ydiff.c:3077:47: warning: to be safe all intermediate pointers in cast from 'GArray ** {aka struct _GArray **}' to 'const GArray ** {aka const struct _GArray **}' must be 'const' qualified [-Wcast-qual]
         dview->display_numbers = calc_nwidth ((const GArray ** const) dview->a);
                                               ^
ydiff.c:3160:48: warning: to be safe all intermediate pointers in cast from 'GArray ** {aka struct _GArray **}' to 'const GArray ** {aka const struct _GArray **}' must be 'const' qualified [-Wcast-qual]
         dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a);
                                                ^

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 src/diffviewer/ydiff.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c
index e3aaeb0..3e3a608 100644
    a b cvt_ncpy (char *dst, int dstsize, const char **_src, size_t srcsize, int base, i 
    13631363 */ 
    13641364 
    13651365static int 
    1366 cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, 
     1366cvt_mget (char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, 
    13671367          gboolean show_cr) 
    13681368{ 
    13691369    int sz = 0; 
    … … cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int 
    14171417                gboolean res; 
    14181418                int ch_len = 1; 
    14191419 
    1420                 (void) dview_get_utf ((char *) src, &ch_len, &res); 
     1420                (void) dview_get_utf (src, &ch_len, &res); 
    14211421 
    14221422                if (ch_len > 1) 
    14231423                    skip += ch_len - 1; 
    … … cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int 
    14621462 */ 
    14631463 
    14641464static int 
    1465 cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, 
     1465cvt_mgeta (char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, 
    14661466           gboolean show_cr, GArray * hdiff, diff_place_t ord, char *att) 
    14671467{ 
    14681468    int sz = 0; 
    … … cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, in 
    15201520                gboolean res; 
    15211521                int ch_len = 1; 
    15221522 
    1523                 (void) dview_get_utf ((char *) src, &ch_len, &res); 
     1523                (void) dview_get_utf (src, &ch_len, &res); 
    15241524                if (ch_len > 1) 
    15251525                    skip += ch_len - 1; 
    15261526#endif 
    … … get_line_numbers (const GArray * a, size_t pos, int *linenum, int *lineofs) 
    19151915/* --------------------------------------------------------------------------------------------- */ 
    19161916 
    19171917static int 
    1918 calc_nwidth (const GArray ** const a) 
     1918calc_nwidth (const GArray *const * a) 
    19191919{ 
    19201920    int l1, o1; 
    19211921    int l2, o2; 
    … … dview_redo (WDiff * dview) 
    27952795        int old; 
    27962796 
    27972797        old = dview->display_numbers; 
    2798         dview->display_numbers = calc_nwidth ((const GArray **) dview->a); 
     2798        dview->display_numbers = calc_nwidth ((const GArray *const *) dview->a); 
    27992799        dview->new_frame = (old != dview->display_numbers); 
    28002800    } 
    28012801    dview_reread (dview); 
    … … dview_load_options (WDiff * dview) 
    30743074        dview->display_symbols = 1; 
    30753075    show_numbers = mc_config_get_bool (mc_main_config, "DiffView", "show_numbers", FALSE); 
    30763076    if (show_numbers) 
    3077         dview->display_numbers = calc_nwidth ((const GArray ** const) dview->a); 
     3077        dview->display_numbers = calc_nwidth ((const GArray *const *) dview->a); 
    30783078    tab_size = mc_config_get_int (mc_main_config, "DiffView", "tab_size", 8); 
    30793079    if (tab_size > 0 && tab_size < 9) 
    30803080        dview->tab_size = tab_size; 
    … … dview_execute_cmd (WDiff * dview, long command) 
    31573157        dview->new_frame = TRUE; 
    31583158        break; 
    31593159    case CK_ShowNumbers: 
    3160         dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a); 
     3160        dview->display_numbers ^= calc_nwidth ((const GArray *const *) dview->a); 
    31613161        dview->new_frame = TRUE; 
    31623162        break; 
    31633163    case CK_SplitFull: