From: Karel Zak <kzak@redhat.com>
Date: Tue, 24 Feb 2026 09:06:16 +0000 (+0100)
Subject: jsonwrt: rename ul_json_format_t to enum ul_json_format
X-Git-Tag: v2.43-devel~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfad19bba3501b267e9c054ffd7b3ba3126ccdfc;p=thirdparty%2Futil-linux.git

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 74b43e213..db409a549 100644
--- 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 57f5703da..4b3af255f 100644
--- 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 07df40d8a..a0f02e075 100644
--- 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 13360ce93..2b22cec24 100644
--- 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;