From: Karel Zak <kzak@redhat.com>
Date: Wed, 18 Apr 2018 14:08:15 +0000 (+0200)
Subject: rfkill: use scols_column_set_json_type()
X-Git-Tag: v2.33-rc1~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d6d789b3aaf449b74036b22917599df225d28f8;p=thirdparty%2Futil-linux.git

rfkill: use scols_column_set_json_type()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
index 9c52fac3a0..57e1dddab0 100644
--- a/sys-utils/rfkill.c
+++ b/sys-utils/rfkill.c
@@ -462,9 +462,16 @@ static void rfkill_list_init(struct control *ctrl)
 
 	for (i = 0; i < (size_t) ncolumns; i++) {
 		const struct colinfo *col = get_column_info(i);
+		struct libscols_column *cl;
 
-		if (!scols_table_new_column(ctrl->tb, col->name, col->whint, col->flags))
+		cl = scols_table_new_column(ctrl->tb, col->name, col->whint, col->flags);
+		if (!cl)
 			err(EXIT_FAILURE, _("failed to allocate output column"));
+		if (ctrl->json) {
+			int id = get_column_id(i);
+			if (id == COL_ID)
+				scols_column_set_json_type(cl, SCOLS_JSON_NUMBER);
+		}
 	}
 }