diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/quotearg.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/quotearg.c b/lib/quotearg.c index 210ce1016..64fa67635 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -30,6 +30,7 @@ #include <ctype.h> #include <errno.h> #include <limits.h> +#include <stdbool.h> #include <stdlib.h> #include <string.h> @@ -192,8 +193,8 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, size_t len = 0; char const *quote_string = 0; size_t quote_string_len = 0; - int backslash_escapes = 0; - int unibyte_locale = MB_CUR_MAX == 1; + bool backslash_escapes = false; + bool unibyte_locale = MB_CUR_MAX == 1; #define STORE(c) \ do \ @@ -208,13 +209,13 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, { case c_quoting_style: STORE ('"'); - backslash_escapes = 1; + backslash_escapes = true; quote_string = "\""; quote_string_len = 1; break; case escape_quoting_style: - backslash_escapes = 1; + backslash_escapes = true; break; case locale_quoting_style: @@ -239,7 +240,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, char const *right = gettext_quote (N_("'"), quoting_style); for (quote_string = left; *quote_string; quote_string++) STORE (*quote_string); - backslash_escapes = 1; + backslash_escapes = true; quote_string = right; quote_string_len = strlen (quote_string); } @@ -396,12 +397,12 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, /* Length of multibyte sequence found so far. */ size_t m; - int printable; + bool printable; if (unibyte_locale) { m = 1; - printable = isprint (c); + printable = isprint (c) != 0; } else { @@ -409,7 +410,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, memset (&mbstate, 0, sizeof mbstate); m = 0; - printable = 1; + printable = true; if (argsize == SIZE_MAX) argsize = strlen (arg); @@ -422,12 +423,12 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, break; else if (bytes == (size_t) -1) { - printable = 0; + printable = false; break; } else if (bytes == (size_t) -2) { - printable = 0; + printable = false; while (i + m < argsize && arg[i + m]) m++; break; @@ -451,7 +452,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, } if (! iswprint (w)) - printable = 0; + printable = false; m += bytes; } } |