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 |
1363 | 1363 | */ |
1364 | 1364 | |
1365 | 1365 | static int |
1366 | | cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, |
| 1366 | cvt_mget (char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, |
1367 | 1367 | gboolean show_cr) |
1368 | 1368 | { |
1369 | 1369 | int sz = 0; |
… |
… |
cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int |
1417 | 1417 | gboolean res; |
1418 | 1418 | int ch_len = 1; |
1419 | 1419 | |
1420 | | (void) dview_get_utf ((char *) src, &ch_len, &res); |
| 1420 | (void) dview_get_utf (src, &ch_len, &res); |
1421 | 1421 | |
1422 | 1422 | if (ch_len > 1) |
1423 | 1423 | skip += ch_len - 1; |
… |
… |
cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int |
1462 | 1462 | */ |
1463 | 1463 | |
1464 | 1464 | static int |
1465 | | cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, |
| 1465 | cvt_mgeta (char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, |
1466 | 1466 | gboolean show_cr, GArray * hdiff, diff_place_t ord, char *att) |
1467 | 1467 | { |
1468 | 1468 | int sz = 0; |
… |
… |
cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, in |
1520 | 1520 | gboolean res; |
1521 | 1521 | int ch_len = 1; |
1522 | 1522 | |
1523 | | (void) dview_get_utf ((char *) src, &ch_len, &res); |
| 1523 | (void) dview_get_utf (src, &ch_len, &res); |
1524 | 1524 | if (ch_len > 1) |
1525 | 1525 | skip += ch_len - 1; |
1526 | 1526 | #endif |
… |
… |
get_line_numbers (const GArray * a, size_t pos, int *linenum, int *lineofs) |
1915 | 1915 | /* --------------------------------------------------------------------------------------------- */ |
1916 | 1916 | |
1917 | 1917 | static int |
1918 | | calc_nwidth (const GArray ** const a) |
| 1918 | calc_nwidth (const GArray *const * a) |
1919 | 1919 | { |
1920 | 1920 | int l1, o1; |
1921 | 1921 | int l2, o2; |
… |
… |
dview_redo (WDiff * dview) |
2795 | 2795 | int old; |
2796 | 2796 | |
2797 | 2797 | 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); |
2799 | 2799 | dview->new_frame = (old != dview->display_numbers); |
2800 | 2800 | } |
2801 | 2801 | dview_reread (dview); |
… |
… |
dview_load_options (WDiff * dview) |
3074 | 3074 | dview->display_symbols = 1; |
3075 | 3075 | show_numbers = mc_config_get_bool (mc_main_config, "DiffView", "show_numbers", FALSE); |
3076 | 3076 | 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); |
3078 | 3078 | tab_size = mc_config_get_int (mc_main_config, "DiffView", "tab_size", 8); |
3079 | 3079 | if (tab_size > 0 && tab_size < 9) |
3080 | 3080 | dview->tab_size = tab_size; |
… |
… |
dview_execute_cmd (WDiff * dview, long command) |
3157 | 3157 | dview->new_frame = TRUE; |
3158 | 3158 | break; |
3159 | 3159 | 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); |
3161 | 3161 | dview->new_frame = TRUE; |
3162 | 3162 | break; |
3163 | 3163 | case CK_SplitFull: |