diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-01 15:25:40 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-13 16:03:23 +0100 |
| commit | d216e2f30580155e18cc7641d8320c06ed4c9c55 (patch) | |
| tree | 1272e177faa1c17084f5b0bdd6738ac6c46dcb31 | |
| parent | 2c881b8064e1cb5b227e5a3c61abfe95c6ddd05a (diff) | |
| download | NetworkManager-d216e2f30580155e18cc7641d8320c06ed4c9c55.tar.gz | |
libnm: fix usage of nm_streq() macro
Yes, C has a preprocessor and nm_streq() currently is a macro.
Still, macros should very much behave like regular functions.
For example, no unexpected side-effects aside what a regular function
would have, evaluating all arguments exactly once, or no side-effects
w.r.t. the order in which arguments are evaluated.
In some cases, we deviate from that for good reasons. For example
NM_IN_SET() may not evaluate all arguments. _LOGD() may not evaluate
any arguments, and NM_UTILS_LOOKUP_STR_DEFINE() is not a function-like
macro at all.
Still, that is not the case here. We avoid to misuse macros to write
code that does not look like C.
| -rw-r--r-- | libnm-core/nm-utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 506f434497..f2d0e94fe5 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -6020,15 +6020,15 @@ _nm_utils_team_link_watchers_to_variant (GPtrArray *link_watchers) name = nm_team_link_watcher_get_name (watcher); g_variant_builder_add (&watcher_builder, "{sv}", - "name", - g_variant_new_string (name)); + "name", + g_variant_new_string (name)); - if nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL) { + if (nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL)) { int_val = nm_team_link_watcher_get_delay_up (watcher); if (int_val) { g_variant_builder_add (&watcher_builder, "{sv}", - "delay-up", - g_variant_new_int32 (int_val)); + "delay-up", + g_variant_new_int32 (int_val)); } int_val = nm_team_link_watcher_get_delay_down (watcher); if (int_val) { @@ -6063,7 +6063,7 @@ _nm_utils_team_link_watchers_to_variant (GPtrArray *link_watchers) "target-host", g_variant_new_string (nm_team_link_watcher_get_target_host (watcher))); - if nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING) { + if (nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING)) { g_variant_builder_add (&builder, "a{sv}", &watcher_builder); continue; } @@ -6155,7 +6155,7 @@ _nm_utils_team_link_watchers_from_variant (GVariant *value) val2 = 0; if (!g_variant_lookup (watcher_var, "missed-max", "i", &val3)) val3 = 3; - if nm_streq (name, NM_TEAM_LINK_WATCHER_ARP_PING) { + if (nm_streq (name, NM_TEAM_LINK_WATCHER_ARP_PING)) { if (!g_variant_lookup (watcher_var, "vlanid", "i", &val4)) val4 = -1; if (!g_variant_lookup (watcher_var, "source-host", "&s", &source_host)) |