From 7fc22ef5de5fe6da9c9bc765da7880d8f4514df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Tue, 19 Nov 2024 09:42:14 +0100 Subject: [PATCH] nmcs: oci: use macro to log warnings --- src/nm-cloud-setup/nmcs-provider-oci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/nm-cloud-setup/nmcs-provider-oci.c b/src/nm-cloud-setup/nmcs-provider-oci.c index 324d88bd84..b6ed6b1713 100644 --- a/src/nm-cloud-setup/nmcs-provider-oci.c +++ b/src/nm-cloud-setup/nmcs-provider-oci.c @@ -82,6 +82,8 @@ detect(NMCSProvider *provider, GTask *task) /*****************************************************************************/ +#define _VNIC_WARN(msg) _LOGW("get-config: " msg "(VNIC %s idx=%zu)", vnic_id, i) + static void _get_config_done_cb(GObject *source, GAsyncResult *result, gpointer user_data) { @@ -112,14 +114,14 @@ _get_config_done_cb(GObject *source, GAsyncResult *result, gpointer user_data) for (i = 0; i < json_array_size(vnics); i++) { json_t *vnic, *field; - const char *vnic_id, *val; + const char *vnic_id = "", *val; gs_free char *mac = NULL; in_addr_t addr; int prefix; vnic = json_array_get(vnics, i); if (!json_is_object(vnic)) { - _LOGW("get-config: JSON parse failure for VNIC at index %zu, ignoring VNIC", i); + _VNIC_WARN("JSON parse failure, ignoring VNIC"); continue; } @@ -129,9 +131,7 @@ _get_config_done_cb(GObject *source, GAsyncResult *result, gpointer user_data) field = json_object_get(vnic, "macAddr"); val = field && json_is_string(field) ? json_string_value(field) : NULL; if (!val) { - _LOGW("get-config: missing or invalid 'macAddr' (VNIC %s idx=%zu), ignoring VNIC", - vnic_id, - i); + _VNIC_WARN("missing or invalid 'macAddr', ignoring VNIC"); continue; } @@ -147,7 +147,7 @@ _get_config_done_cb(GObject *source, GAsyncResult *result, gpointer user_data) config_iface_data->ipv4s_arr = g_new(in_addr_t, 1); config_iface_data->ipv4s_arr[0] = addr; } else { - _LOGW("get-config: missing or invalid 'privateIp' (VNIC %s idx=%zu)", vnic_id, i); + _VNIC_WARN("missing or invalid 'privateIp'"); } field = json_object_get(vnic, "virtualRouterIp"); @@ -156,7 +156,7 @@ _get_config_done_cb(GObject *source, GAsyncResult *result, gpointer user_data) config_iface_data->has_gateway = TRUE; config_iface_data->gateway = addr; } else { - _LOGW("get-config: missing or invalid 'virtualRouterIp' (VNIC %s idx=%zu)", vnic_id, i); + _VNIC_WARN("missing or invalid 'virtualRouterIp'"); } field = json_object_get(vnic, "subnetCidrBlock"); @@ -166,7 +166,7 @@ _get_config_done_cb(GObject *source, GAsyncResult *result, gpointer user_data) config_iface_data->cidr_addr = addr; config_iface_data->cidr_prefix = prefix; } else { - _LOGW("get-config: missing or invalid 'subnetCidrBlock' (VNIC %s idx=%zu)", vnic_id, i); + _VNIC_WARN("missing or invalid 'subnetCidrBlock'"); } }