diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/meson.build | 6 | ||||
| -rw-r--r-- | utils/pango-segmentation.c | 6 | ||||
| -rw-r--r-- | utils/viewer-render.c | 3 | ||||
| -rw-r--r-- | utils/viewer-x.c | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/utils/meson.build b/utils/meson.build index 6d06dbec..5072c1cc 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -34,7 +34,7 @@ pango_view = executable('pango-view', pango_view_sources, dependencies: pango_view_deps, include_directories: [ root_inc ], install: true, - c_args: [ + c_args: common_cflags + pango_debug_cflags + [ '-DPACKAGE_NAME="@0@"'.format(meson.project_name()), '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), ]) @@ -74,7 +74,7 @@ if cairo_dep.found() dependencies: pango_list_deps, include_directories: [ root_inc ], install: true, - c_args: [ + c_args: common_cflags + pango_debug_cflags + [ '-DPACKAGE_NAME="@0@"'.format(meson.project_name()), '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), ]) @@ -94,7 +94,7 @@ if cairo_dep.found() dependencies: pango_segmentation_deps, include_directories: [ root_inc ], install: true, - c_args: [ + c_args: common_cflags + pango_debug_cflags + [ '-DPACKAGE_NAME="@0@"'.format(meson.project_name()), '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), ]) diff --git a/utils/pango-segmentation.c b/utils/pango-segmentation.c index 31cefdbd..65734dc4 100644 --- a/utils/pango-segmentation.c +++ b/utils/pango-segmentation.c @@ -141,8 +141,8 @@ show_segmentation (const char *input, int main (int argc, char *argv[]) { - char *opt_kind = "grapheme"; - char *opt_text = NULL; + const char *opt_kind = "grapheme"; + const char *opt_text = NULL; gboolean opt_version = FALSE; GOptionEntry entries[] = { { "kind", 0, 0, G_OPTION_ARG_STRING, &opt_kind, "Kind of boundary (grapheme/word/line/sentence)", "KIND" }, @@ -176,7 +176,7 @@ main (int argc, char *argv[]) if (opt_text) { - text = opt_text; + text = (char *)opt_text; } else if (argc > 1) { diff --git a/utils/viewer-render.c b/utils/viewer-render.c index 8816f06f..d5ca5e3e 100644 --- a/utils/viewer-render.c +++ b/utils/viewer-render.c @@ -709,6 +709,7 @@ parse_margin (const char *name G_GNUC_UNUSED, { switch (sscanf (arg, "%d%*[ ,]%d%*[ ,]%d%*[ ,]%d", &opt_margin_t, &opt_margin_r, &opt_margin_b, &opt_margin_l)) { + default: case 0: { g_set_error(error, @@ -718,7 +719,9 @@ parse_margin (const char *name G_GNUC_UNUSED, return FALSE; } case 1: opt_margin_r = opt_margin_t; + G_GNUC_FALLTHROUGH; case 2: opt_margin_b = opt_margin_t; + G_GNUC_FALLTHROUGH; case 3: opt_margin_l = opt_margin_r; } return TRUE; diff --git a/utils/viewer-x.c b/utils/viewer-x.c index ad1c9a8d..02c688ea 100644 --- a/utils/viewer-x.c +++ b/utils/viewer-x.c @@ -213,6 +213,8 @@ x_view_display (gpointer instance, case Expose: expose (&xev.xexpose, &update_region); break; + default: + break; } } } |