From 113672e309bab1118d48dde0a0e69f27e926b3d9 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sun, 20 Dec 2015 19:05:00 +0000
Subject: [PATCH] diffviewer.c: use gboolean at WDiff struct
Signed-off-by: Andreas Mohr <and@gmx.li>
---
src/diffviewer/internal.h | 8 ++++----
src/diffviewer/ydiff.c | 38 +++++++++++++++++++-------------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/diffviewer/internal.h b/src/diffviewer/internal.h
index 41f0de5..728d4b5 100644
a
|
b
|
typedef struct WDiff |
97 | 97 | int ndiff; /* number of hunks */ |
98 | 98 | DSRC dsrc; /* data source: memory or temporary file */ |
99 | 99 | |
100 | | int view_quit:1; /* Quit flag */ |
| 100 | gboolean view_quit; /* Quit flag */ |
101 | 101 | |
102 | 102 | int height; |
103 | 103 | int half1; |
… |
… |
typedef struct WDiff |
105 | 105 | int width1; |
106 | 106 | int width2; |
107 | 107 | int bias; |
108 | | int new_frame; |
| 108 | gboolean new_frame; |
109 | 109 | int skip_rows; |
110 | 110 | int skip_cols; |
111 | 111 | int display_symbols; |
112 | 112 | int display_numbers; |
113 | | int show_cr; |
| 113 | gboolean show_cr; |
114 | 114 | int tab_size; |
115 | 115 | diff_place_t ord; |
116 | | int full; |
| 116 | gboolean full; |
117 | 117 | |
118 | 118 | #ifdef HAVE_CHARSET |
119 | 119 | gboolean utf8; |
diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c
index d1597cc..238e73b 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, int show_cr) |
| 1366 | cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, gboolean show_cr) |
1367 | 1367 | { |
1368 | 1368 | int sz = 0; |
1369 | 1369 | |
… |
… |
cvt_mget (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int |
1461 | 1461 | */ |
1462 | 1462 | |
1463 | 1463 | static int |
1464 | | cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, int show_cr, |
| 1464 | cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, int ts, gboolean show_cr, |
1465 | 1465 | GArray * hdiff, diff_place_t ord, char *att) |
1466 | 1466 | { |
1467 | 1467 | int sz = 0; |
… |
… |
cvt_mgeta (const char *src, size_t srcsize, char *dst, int dstsize, int skip, in |
1562 | 1562 | */ |
1563 | 1563 | |
1564 | 1564 | static int |
1565 | | cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, int show_cr) |
| 1565 | cvt_fget (FBUF * f, off_t off, char *dst, size_t dstsize, int skip, int ts, gboolean show_cr) |
1566 | 1566 | { |
1567 | 1567 | int base = 0; |
1568 | 1568 | int old_base = base; |
… |
… |
dview_init (WDiff * dview, const char *args, const char *file1, const char *file |
2455 | 2455 | |
2456 | 2456 | dview->ndiff = ndiff; |
2457 | 2457 | |
2458 | | dview->view_quit = 0; |
| 2458 | dview->view_quit = FALSE; |
2459 | 2459 | |
2460 | 2460 | dview->bias = 0; |
2461 | | dview->new_frame = 1; |
| 2461 | dview->new_frame = TRUE; |
2462 | 2462 | dview->skip_rows = 0; |
2463 | 2463 | dview->skip_cols = 0; |
2464 | 2464 | dview->display_symbols = 0; |
2465 | 2465 | dview->display_numbers = 0; |
2466 | | dview->show_cr = 1; |
| 2466 | dview->show_cr = TRUE; |
2467 | 2467 | dview->tab_size = 8; |
2468 | 2468 | dview->ord = DIFF_LEFT; |
2469 | | dview->full = 0; |
| 2469 | dview->full = FALSE; |
2470 | 2470 | |
2471 | 2471 | dview->search.handle = NULL; |
2472 | 2472 | dview->search.last_string = NULL; |
… |
… |
dview_display_file (const WDiff * dview, diff_place_t ord, int r, int c, int hei |
2531 | 2531 | int skip = dview->skip_cols; |
2532 | 2532 | int display_symbols = dview->display_symbols; |
2533 | 2533 | int display_numbers = dview->display_numbers; |
2534 | | int show_cr = dview->show_cr; |
| 2534 | gboolean show_cr = dview->show_cr; |
2535 | 2535 | int tab_size = 8; |
2536 | 2536 | const DIFFLN *p; |
2537 | 2537 | int nwidth = display_numbers; |
… |
… |
dview_update (WDiff * dview) |
2861 | 2861 | tty_draw_vline (2, width1 + xwidth, ACS_VLINE, height - 2); |
2862 | 2862 | } |
2863 | 2863 | } |
2864 | | dview->new_frame = 0; |
| 2864 | dview->new_frame = FALSE; |
2865 | 2865 | } |
2866 | 2866 | |
2867 | 2867 | if (width1 > 2) |
… |
… |
dview_load_options (WDiff * dview) |
3093 | 3093 | dview->opt.ignore_case = |
3094 | 3094 | mc_config_get_bool (mc_main_config, "DiffView", "diff_ignore_case", FALSE); |
3095 | 3095 | |
3096 | | dview->new_frame = 1; |
| 3096 | dview->new_frame = TRUE; |
3097 | 3097 | } |
3098 | 3098 | |
3099 | 3099 | /* --------------------------------------------------------------------------------------------- */ |
… |
… |
dview_execute_cmd (WDiff * dview, long command) |
3153 | 3153 | { |
3154 | 3154 | case CK_ShowSymbols: |
3155 | 3155 | dview->display_symbols ^= 1; |
3156 | | dview->new_frame = 1; |
| 3156 | dview->new_frame = TRUE; |
3157 | 3157 | break; |
3158 | 3158 | case CK_ShowNumbers: |
3159 | 3159 | dview->display_numbers ^= calc_nwidth ((const GArray ** const) dview->a); |
3160 | | dview->new_frame = 1; |
| 3160 | dview->new_frame = TRUE; |
3161 | 3161 | break; |
3162 | 3162 | case CK_SplitFull: |
3163 | | dview->full ^= 1; |
3164 | | dview->new_frame = 1; |
| 3163 | dview->full = !dview->full; |
| 3164 | dview->new_frame = TRUE; |
3165 | 3165 | break; |
3166 | 3166 | case CK_SplitEqual: |
3167 | 3167 | if (!dview->full) |
3168 | 3168 | { |
3169 | 3169 | dview->bias = 0; |
3170 | | dview->new_frame = 1; |
| 3170 | dview->new_frame = TRUE; |
3171 | 3171 | } |
3172 | 3172 | break; |
3173 | 3173 | case CK_SplitMore: |
3174 | 3174 | if (!dview->full) |
3175 | 3175 | { |
3176 | 3176 | dview_compute_split (dview, 1); |
3177 | | dview->new_frame = 1; |
| 3177 | dview->new_frame = TRUE; |
3178 | 3178 | } |
3179 | 3179 | break; |
3180 | 3180 | |
… |
… |
dview_execute_cmd (WDiff * dview, long command) |
3182 | 3182 | if (!dview->full) |
3183 | 3183 | { |
3184 | 3184 | dview_compute_split (dview, -1); |
3185 | | dview->new_frame = 1; |
| 3185 | dview->new_frame = TRUE; |
3186 | 3186 | } |
3187 | 3187 | break; |
3188 | 3188 | case CK_Tab2: |
… |
… |
dview_execute_cmd (WDiff * dview, long command) |
3284 | 3284 | view_other_cmd (); |
3285 | 3285 | break; |
3286 | 3286 | case CK_Quit: |
3287 | | dview->view_quit = 1; |
| 3287 | dview->view_quit = TRUE; |
3288 | 3288 | break; |
3289 | 3289 | case CK_Save: |
3290 | 3290 | dview_do_save (dview); |
… |
… |
dview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d |
3343 | 3343 | return MSG_HANDLED; |
3344 | 3344 | |
3345 | 3345 | case MSG_DRAW: |
3346 | | dview->new_frame = 1; |
| 3346 | dview->new_frame = TRUE; |
3347 | 3347 | dview_update (dview); |
3348 | 3348 | return MSG_HANDLED; |
3349 | 3349 | |