From 5b626b4a3c9f06467bd5d7f042657def8e6b5da6 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 4 Mar 2020 17:13:46 +0000
Subject: [PATCH] bin: Generalize jsonify_enum()

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 bin/system-info.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/system-info.c b/bin/system-info.c
index ed6dc1c86..7192ab25c 100644
--- a/bin/system-info.c
+++ b/bin/system-info.c
@@ -266,10 +266,11 @@ jsonify_graphics_issues (JsonBuilder *builder,
 }
 
 static void
-jsonify_graphics_library_vendor (JsonBuilder *builder,
-                                 SrtGraphicsLibraryVendor vendor)
+jsonify_enum (JsonBuilder *builder,
+              GType type,
+              int value)
 {
-  const char *s = srt_enum_value_to_nick (SRT_TYPE_GRAPHICS_LIBRARY_VENDOR, vendor);
+  const char *s = srt_enum_value_to_nick (type, value);
 
   if (s != NULL)
     {
@@ -277,7 +278,7 @@ jsonify_graphics_library_vendor (JsonBuilder *builder,
     }
   else
     {
-      gchar *fallback = g_strdup_printf ("(unknown value %d)", vendor);
+      gchar *fallback = g_strdup_printf ("(unknown value %d)", value);
 
       json_builder_add_string_value (builder, fallback);
       g_free (fallback);
@@ -418,7 +419,7 @@ print_graphics_details(JsonBuilder *builder,
         {
           json_builder_set_member_name (builder, "library-vendor");
           srt_graphics_library_is_vendor_neutral (g->data, &library_vendor);
-          jsonify_graphics_library_vendor (builder, library_vendor);
+          jsonify_enum (builder, SRT_TYPE_GRAPHICS_LIBRARY_VENDOR, library_vendor);
         }
 
       if (srt_graphics_get_issues (g->data) != SRT_GRAPHICS_ISSUES_NONE)
-- 
GitLab