jsonwrt: rename ul_json_format_t to enum ul_json_format

The _t suffix is reserved by POSIX. Use a plain enum tag instead.

Addresses: https://github.com/util-linux/util-linux/pull/4025
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/jsonwrt.h b/include/jsonwrt.h
index 74b43e2139ff58629cee729fe9a7b00e4fd73534..db409a549bc71604c641fa444175d867137a5f25 100644 (file)
--- a/include/jsonwrt.h
+++ b/include/jsonwrt.h
@@ -11,21 +11,21 @@ enum {
        UL_JSON_VALUE
 };
 
-typedef enum {
+enum ul_json_format {
        UL_JSON_PRETTY,
        UL_JSON_COMPACT,
        UL_JSON_LINE,
-} ul_json_format_t;
+};
 
 struct ul_jsonwrt {
        FILE *out;
        int indent;
 
        unsigned int after_close :1;
-       ul_json_format_t json_format;
+       enum ul_json_format json_format;
 };
 
-void ul_jsonwrt_init(struct ul_jsonwrt *fmt, FILE *out, int indent, ul_json_format_t json_format);
+void ul_jsonwrt_init(struct ul_jsonwrt *fmt, FILE *out, int indent, enum ul_json_format json_format);
 int ul_jsonwrt_is_ready(struct ul_jsonwrt *fmt);
 void ul_jsonwrt_indent(struct ul_jsonwrt *fmt);
 void ul_jsonwrt_open(struct ul_jsonwrt *fmt, const char *name, int type);

diff --git a/lib/jsonwrt.c b/lib/jsonwrt.c
index 57f5703da5686631d5c558d6a4497ddca96fecee..4b3af255fea1415feec8c6e075782bf51d686ffd 100644 (file)
--- a/lib/jsonwrt.c
+++ b/lib/jsonwrt.c
@@ -102,7 +102,7 @@ static void fputs_quoted_case_json(const char *data, FILE *out, int dir, size_t
 #define fputs_quoted_json_upper(_d, _o) fputs_quoted_case_json(_d, _o, 1, 0)
 #define fputs_quoted_json_lower(_d, _o) fputs_quoted_case_json(_d, _o, -1, 0)
 
-void ul_jsonwrt_init(struct ul_jsonwrt *fmt, FILE *out, int indent, ul_json_format_t json_format)
+void ul_jsonwrt_init(struct ul_jsonwrt *fmt, FILE *out, int indent, enum ul_json_format json_format)
 {
        fmt->out = out;
        fmt->indent = indent;

diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h
index 07df40d8ab9bb4d1dfb370e1a64ad99d6c149f15..a0f02e0750484fa0e1917ab1c009c58de0fe4aee 100644 (file)
--- a/libsmartcols/src/smartcolsP.h
+++ b/libsmartcols/src/smartcolsP.h
@@ -270,7 +270,7 @@ struct libscols_table {
        struct libscols_line *cur_line;         /* currently used line */
        struct libscols_column *cur_column;     /* currently used column */
 
-       ul_json_format_t json_format;   /* JSON output format */
+       enum ul_json_format json_format;        /* JSON output format */
 
        /* flags */
        bool            ascii         , /* don't use unicode */

diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index 13360ce93de7cf3f557bab09fdaed57ef7f8494a..2b22cec24efceb39b590f9f7486c333742178935 100644 (file)
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -60,7 +60,7 @@ static void check_padding_debug(struct libscols_table *tb)
        tb->padding_debug = 1;
 }
 
-static ul_json_format_t get_json_format(void)
+static enum ul_json_format get_json_format(void)
 {
        const char *str;