From ef772bf97f7ec577754cbb5b278504d83cf41a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Sun, 11 Apr 2021 18:23:21 +0100 Subject: maint: use "char const *" rather than "const char *" * cfg.mk (sc_prohibit-const-char): Add a new syntax-check to enforce this style. * *.[ch]: sed -i 's/const char \*/char const */g' --- gl/lib/mbsalign.c | 6 +++--- gl/lib/mbsalign.h | 4 ++-- gl/lib/smack.h | 2 +- gl/lib/xdectoint.c | 8 ++++---- gl/lib/xdectoint.h | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'gl') diff --git a/gl/lib/mbsalign.c b/gl/lib/mbsalign.c index f23bc3160..74e28ca1b 100644 --- a/gl/lib/mbsalign.c +++ b/gl/lib/mbsalign.c @@ -109,14 +109,14 @@ mbs_align_pad (char *dest, const char* dest_end, size_t n_spaces) Update *WIDTH to indicate how many columns were used before padding. */ size_t -mbsalign (const char *src, char *dest, size_t dest_size, +mbsalign (char const *src, char *dest, size_t dest_size, size_t *width, mbs_align_t align, int flags) { size_t ret = SIZE_MAX; size_t src_size = strlen (src) + 1; char *newstr = NULL; wchar_t *str_wc = NULL; - const char *str_to_print = src; + char const *str_to_print = src; size_t n_cols = src_size - 1; size_t n_used_bytes = n_cols; /* Not including NUL */ size_t n_spaces = 0; @@ -245,7 +245,7 @@ mbsalign_cleanup: Return NULL on failure. */ char * -ambsalign (const char *src, size_t *width, mbs_align_t align, int flags) +ambsalign (char const *src, size_t *width, mbs_align_t align, int flags) { size_t orig_width = *width; size_t size = *width; /* Start with enough for unibyte mode. */ diff --git a/gl/lib/mbsalign.h b/gl/lib/mbsalign.h index 05fe30226..4fdcac419 100644 --- a/gl/lib/mbsalign.h +++ b/gl/lib/mbsalign.h @@ -52,8 +52,8 @@ enum { }; size_t -mbsalign (const char *src, char *dest, size_t dest_size, +mbsalign (char const *src, char *dest, size_t dest_size, size_t *width, mbs_align_t align, int flags); char * -ambsalign (const char *src, size_t *width, mbs_align_t align, int flags); +ambsalign (char const *src, size_t *width, mbs_align_t align, int flags); diff --git a/gl/lib/smack.h b/gl/lib/smack.h index b7bbc349d..92c257a83 100644 --- a/gl/lib/smack.h +++ b/gl/lib/smack.h @@ -29,7 +29,7 @@ smack_new_label_from_self (char **label) } static inline int -smack_set_label_for_self (const char *label) +smack_set_label_for_self (char const *label) { return -1; } diff --git a/gl/lib/xdectoint.c b/gl/lib/xdectoint.c index 95f6c1359..04f5c7035 100644 --- a/gl/lib/xdectoint.c +++ b/gl/lib/xdectoint.c @@ -33,8 +33,8 @@ ERR is printed along with N_STR on error. */ __xdectoint_t -__xnumtoint (const char *n_str, int base, __xdectoint_t min, __xdectoint_t max, - const char *suffixes, const char *err, int err_exit) +__xnumtoint (char const *n_str, int base, __xdectoint_t min, __xdectoint_t max, + char const *suffixes, char const *err, int err_exit) { strtol_error s_err; @@ -79,8 +79,8 @@ __xnumtoint (const char *n_str, int base, __xdectoint_t min, __xdectoint_t max, ERR is printed along with N_STR on error. */ __xdectoint_t -__xdectoint (const char *n_str, __xdectoint_t min, __xdectoint_t max, - const char *suffixes, const char *err, int err_exit) +__xdectoint (char const *n_str, __xdectoint_t min, __xdectoint_t max, + char const *suffixes, char const *err, int err_exit) { return __xnumtoint (n_str, 10, min, max, suffixes, err, err_exit); } diff --git a/gl/lib/xdectoint.h b/gl/lib/xdectoint.h index 278af885a..a1a381240 100644 --- a/gl/lib/xdectoint.h +++ b/gl/lib/xdectoint.h @@ -21,11 +21,11 @@ # include # define _DECLARE_XDECTOINT(name, type) \ - type name (const char *n_str, type min, type max, \ - const char *suffixes, const char *err, int err_exit); + type name (char const *n_str, type min, type max, \ + char const *suffixes, char const *err, int err_exit); # define _DECLARE_XNUMTOINT(name, type) \ - type name (const char *n_str, int base, type min, type max, \ - const char *suffixes, const char *err, int err_exit); + type name (char const *n_str, int base, type min, type max, \ + char const *suffixes, char const *err, int err_exit); _DECLARE_XDECTOINT (xdectoimax, intmax_t) _DECLARE_XDECTOINT (xdectoumax, uintmax_t) -- cgit v1.2.1