From 5bd8021f5355b022845f0688a13c0881a56c3b53 Mon Sep 17 00:00:00 2001
From: Burt P <pburt0@gmail.com>
Date: Tue, 2 Jul 2019 20:42:34 -0500
Subject: struct info: add macros as described by lpereira

See:
https://github.com/lpereira/hardinfo/pull/393#issuecomment-507893260

Signed-off-by: Burt P <pburt0@gmail.com>
---
 hardinfo/info.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'hardinfo/info.c')

diff --git a/hardinfo/info.c b/hardinfo/info.c
index 368470b4..b9cd8cb9 100644
--- a/hardinfo/info.c
+++ b/hardinfo/info.c
@@ -40,7 +40,7 @@ void info_group_add_fieldsv(struct InfoGroup *group, va_list ap)
     while (1) {
         struct InfoField field = va_arg(ap, struct InfoField);
 
-        if (!field.name)
+        if (field.magic == INFO_LAST_MARKER)
             break;
         g_array_append_val(group->fields, field);
     }
@@ -72,23 +72,6 @@ struct InfoGroup *info_add_group(struct Info *info, const gchar *group_name, ...
     return &g_array_index(info->groups, struct InfoGroup, info->groups->len - 1);
 }
 
-struct InfoField info_field(const gchar *name, const gchar *value)
-{
-    return (struct InfoField) {
-        .name = name,
-        .value = value,
-    };
-}
-
-struct InfoField info_field_update(const gchar *name, int update_interval)
-{
-    return (struct InfoField) {
-        .name = name,
-        .value = "...",
-        .update_interval = update_interval,
-    };
-}
-
 struct InfoField info_field_printf(const gchar *name, const gchar *format, ...)
 {
     gchar *value;
@@ -105,11 +88,6 @@ struct InfoField info_field_printf(const gchar *name, const gchar *format, ...)
     };
 }
 
-struct InfoField info_field_last(void)
-{
-    return (struct InfoField) {};
-}
-
 void info_add_computed_group(struct Info *info, const gchar *name, const gchar *value)
 {
     /* This is a scaffolding method: HardInfo should move away from pre-computing
-- 
cgit v1.2.3