aboutsummaryrefslogtreecommitdiff
path: root/includes/info.h
diff options
context:
space:
mode:
authorBurt P <pburt0@gmail.com>2019-07-02 20:42:34 -0500
committerLeandro A. F. Pereira <leandro@hardinfo.org>2019-07-06 13:08:54 -0700
commit5bd8021f5355b022845f0688a13c0881a56c3b53 (patch)
tree5bf17273b626dbfad334c4485e35cd7b3461ce13 /includes/info.h
parent285664ed7e706d731e20064b40746204db72fbc4 (diff)
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>
Diffstat (limited to 'includes/info.h')
-rw-r--r--includes/info.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/includes/info.h b/includes/info.h
index da4c12e4..47e41980 100644
--- a/includes/info.h
+++ b/includes/info.h
@@ -61,6 +61,7 @@ struct InfoField {
unsigned int flags;
gboolean free_value_on_flatten;
+ int magic;
};
struct Info *info_new(void);
@@ -71,11 +72,17 @@ void info_add_computed_group(struct Info *info, const gchar *name, const gchar *
void info_group_add_fields(struct InfoGroup *group, ...);
void info_group_add_fieldsv(struct InfoGroup *group, va_list ap);
-struct InfoField info_field(const gchar *name, const gchar *value);
struct InfoField info_field_printf(const gchar *name, const gchar *format, ...)
__attribute__((format(printf, 2, 3)));
-struct InfoField info_field_update(const gchar *name, int update_interval);
-struct InfoField info_field_last(void);
+
+#define INFO_LAST_MARKER 102
+#define info_field_full(...) (struct InfoField) { \
+ .magic = 3, \
+ __VA_ARGS__ \
+}
+#define info_field(n, v) info_field_full(.name = (n), .value = (v))
+#define info_field_update(n, ui) info_field_full(.name = (n), .value = "...", .update_interval = (ui))
+#define info_field_last() (struct InfoField){.magic = INFO_LAST_MARKER}
static inline struct InfoField info_field_with_icon(struct InfoField field, const gchar *icon)
{