fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 07:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

format: mark json_{object,array}_foreach() macors as ForEachMacros for clang-format

Browse source
This commit is contained in:
Thomas Haller 2020-11-05 20:27:59 +01:00
parent 7e39e23f64
commit 7d5ec103df
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -85,6 +85,8 @@ ForEachMacros: ['c_list_for_each',
'c_rbtree_for_each_safe', 'c_rbtree_for_each_safe',
'c_rbtree_for_each_safe_postorder', 'c_rbtree_for_each_safe_postorder',
'c_rbtree_for_each_safe_postorder_unlink', 'c_rbtree_for_each_safe_postorder_unlink',
'json_array_foreach',
'json_object_foreach',
'json_object_foreach_safe', 'json_object_foreach_safe',
'ndp_msg_opt_dnssl_for_each_domain', 'ndp_msg_opt_dnssl_for_each_domain',
'ndp_msg_opt_for_each_offset', 'ndp_msg_opt_for_each_offset',

18
src/devices/ovs/nm-ovsdb.c
View file

@ -1101,8 +1101,7 @@ _uuids_to_array(GPtrArray *array, const json_t *items)
if (g_strcmp0(key, "uuid") == 0 && json_is_string(value)) { if (g_strcmp0(key, "uuid") == 0 && json_is_string(value)) {
g_ptr_array_add(array, g_strdup(json_string_value(value))); g_ptr_array_add(array, g_strdup(json_string_value(value)));
} else if (g_strcmp0(key, "set") == 0 && json_is_array(value)) { } else if (g_strcmp0(key, "set") == 0 && json_is_array(value)) {
json_array_foreach(value, set_index, set_value) json_array_foreach (value, set_index, set_value) {
{
_uuids_to_array(array, set_value); _uuids_to_array(array, set_value);
} }
} }
@ -1118,8 +1117,7 @@ _connection_uuid_from_external_ids(json_t *external_ids)
if (g_strcmp0("map", json_string_value(json_array_get(external_ids, 0))) != 0) if (g_strcmp0("map", json_string_value(json_array_get(external_ids, 0))) != 0)
return NULL; return NULL;
json_array_foreach(json_array_get(external_ids, 1), index, value) json_array_foreach (json_array_get(external_ids, 1), index, value) {
{
if (g_strcmp0("NM.connection.uuid", json_string_value(json_array_get(value, 0))) == 0) if (g_strcmp0("NM.connection.uuid", json_string_value(json_array_get(value, 0))) == 0)
return g_strdup(json_string_value(json_array_get(value, 1))); return g_strdup(json_string_value(json_array_get(value, 1)));
} }
@ -1180,8 +1178,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg)
} }
/* Interfaces */ /* Interfaces */
json_object_foreach(interface, key, value) json_object_foreach (interface, key, value) {
{
json_t * error = NULL; json_t * error = NULL;
gboolean old = FALSE; gboolean old = FALSE;
gboolean new = FALSE; gboolean new = FALSE;
@ -1269,8 +1266,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg)
} }
/* Ports */ /* Ports */
json_object_foreach(port, key, value) json_object_foreach (port, key, value) {
{
gboolean old = FALSE; gboolean old = FALSE;
gboolean new = FALSE; gboolean new = FALSE;
@ -1333,8 +1329,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg)
} }
/* Bridges */ /* Bridges */
json_object_foreach(bridge, key, value) json_object_foreach (bridge, key, value) {
{
gboolean old = FALSE; gboolean old = FALSE;
gboolean new = FALSE; gboolean new = FALSE;
@ -1838,8 +1833,7 @@ _transact_cb(NMOvsdb *self, json_t *result, GError *error, gpointer user_data)
if (error) if (error)
goto out; goto out;
json_array_foreach(result, index, value) json_array_foreach (result, index, value) {
{
if (json_unpack(value, "{s:s, s:s}", "error", &err, "details", &err_details) == 0) { if (json_unpack(value, "{s:s, s:s}", "error", &err, "details", &err_details) == 0) {
g_set_error(&error, g_set_error(&error,
G_IO_ERROR, G_IO_ERROR,