| From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001 |
| From: Robert Yang <liezhi.yang@windriver.com> |
| Date: Sun, 19 Feb 2017 23:32:46 -0800 |
| Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues |
| |
| Fixed when compile with "-Wformat -Wformat-security -Werror=format-security": |
| | gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset': |
| | gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security] |
| | fprintf (a_fp, str) ; |
| |
| And: |
| gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=] |
| fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size); |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| --- |
| gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++----- |
| gettext-tools/gnulib-lib/libxml/timsort.h | 2 +- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c |
| index 617520f..100104b 100644 |
| --- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c |
| +++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c |
| @@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent) |
| g_return_if_fail (a_fp && a_this); |
| str = cr_statement_ruleset_to_string (a_this, a_indent); |
| if (str) { |
| - fprintf (a_fp, str); |
| + fprintf (a_fp, "%s", str); |
| g_free (str); |
| str = NULL; |
| } |
| @@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent) |
| str = cr_statement_charset_to_string (a_this, |
| a_indent) ; |
| if (str) { |
| - fprintf (a_fp, str) ; |
| + fprintf (a_fp, "%s", str) ; |
| g_free (str) ; |
| str = NULL ; |
| } |
| @@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent) |
| |
| str = cr_statement_at_page_rule_to_string (a_this, a_indent) ; |
| if (str) { |
| - fprintf (a_fp, str); |
| + fprintf (a_fp, "%s", str); |
| g_free (str) ; |
| str = NULL ; |
| } |
| @@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this, |
| |
| str = cr_statement_media_rule_to_string (a_this, a_indent) ; |
| if (str) { |
| - fprintf (a_fp, str) ; |
| + fprintf (a_fp, "%s", str) ; |
| g_free (str) ; |
| str = NULL ; |
| } |
| @@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp, |
| |
| str = cr_statement_import_rule_to_string (a_this, a_indent) ; |
| if (str) { |
| - fprintf (a_fp, str) ; |
| + fprintf (a_fp, "%s", str) ; |
| g_free (str) ; |
| str = NULL ; |
| } |
| diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h |
| index 795f272..443918a 100644 |
| --- a/gettext-tools/gnulib-lib/libxml/timsort.h |
| +++ b/gettext-tools/gnulib-lib/libxml/timsort.h |
| @@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size) |
| SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE)); |
| if (tempstore == NULL) |
| { |
| - fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size); |
| + fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size); |
| exit(1); |
| } |
| store->storage = tempstore; |
| -- |
| 2.10.2 |
| |