colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: avoid "-Wmissing-braces" warning for teams _prop_to_keys array

Browse Source 
[1/384] Compiling C object 'libnm-core/2b1af02@@nm-core@sta/nm-setting-team.c.o'.
    ../libnm-core/nm-setting-team.c:649:77: warning: missing braces around initializer [-Wmissing-braces]
     static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
                                                                                 ^
      [PROP_CONFIG] =                      { NULL, NULL, NULL, 0 },
                                                               { }

And use designated initializers.
This commit is contained in:
Thomas Haller
2019-02-08 11:00:19 +01:00
parent 4f931a1920
commit ce8b053674
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libnm-core/nm-setting-team-port.c
View File

@@ -42,7 +42,6 @@
/*****************************************************************************/ /*****************************************************************************/
/* Keep aligned with _prop_to_keys[] */
NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort, NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort,
PROP_CONFIG, PROP_CONFIG,
PROP_QUEUE_ID, PROP_QUEUE_ID,
@@ -53,15 +52,14 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort,
PROP_LINK_WATCHERS, PROP_LINK_WATCHERS,
); );
/* Keep aligned with team-port properties enum */
static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = { static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
[PROP_CONFIG] = { NULL, NULL, NULL, 0 }, [PROP_CONFIG] = { },
[PROP_QUEUE_ID] = { "queue_id", NULL, NULL, NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT }, [PROP_QUEUE_ID] = { .key1 = "queue_id", .default_int = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT, },
[PROP_PRIO] = { "prio", NULL, NULL, 0 }, [PROP_PRIO] = { .key1 = "prio", },
[PROP_STICKY] = { "sticky", NULL, NULL, 0 }, [PROP_STICKY] = { .key1 = "sticky", },
[PROP_LACP_PRIO] = { "lacp_prio", NULL, NULL, NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT }, [PROP_LACP_PRIO] = { .key1 = "lacp_prio", .default_int = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT, },
[PROP_LACP_KEY] = { "lacp_key", NULL, NULL, 0 }, [PROP_LACP_KEY] = { .key1 = "lacp_key", },
[PROP_LINK_WATCHERS] = { "link_watch", NULL, NULL, 0 } [PROP_LINK_WATCHERS] = { .key1 = "link_watch", },
}; };
typedef struct { typedef struct {

35
libnm-core/nm-setting-team.c
View File

@@ -625,7 +625,6 @@ nm_team_link_watcher_get_flags (NMTeamLinkWatcher *watcher)
/*****************************************************************************/ /*****************************************************************************/
/* Keep aligned with _prop_to_keys[] */
NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeam, NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeam,
PROP_CONFIG, PROP_CONFIG,
PROP_NOTIFY_PEERS_COUNT, PROP_NOTIFY_PEERS_COUNT,
@@ -645,25 +644,23 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeam,
PROP_LINK_WATCHERS, PROP_LINK_WATCHERS,
); );
/* Keep aligned with team properties enum */
static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = { static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
[PROP_CONFIG] = { NULL, NULL, NULL, 0 }, [PROP_CONFIG] = { },
[PROP_NOTIFY_PEERS_COUNT] = { "notify_peers", "count", NULL, 0 }, [PROP_NOTIFY_PEERS_COUNT] = { .key1 = "notify_peers", .key2 = "count", },
[PROP_NOTIFY_PEERS_INTERVAL] = { "notify_peers", "interval", NULL, 0 }, [PROP_NOTIFY_PEERS_INTERVAL] = { .key1 = "notify_peers", .key2 = "interval", },
[PROP_MCAST_REJOIN_COUNT] = { "mcast_rejoin", "count", NULL, 0 }, [PROP_MCAST_REJOIN_COUNT] = { .key1 = "mcast_rejoin", .key2 = "count", },
[PROP_MCAST_REJOIN_INTERVAL] = { "mcast_rejoin", "interval", NULL, 0 }, [PROP_MCAST_REJOIN_INTERVAL] = { .key1 = "mcast_rejoin", .key2 = "interval", },
[PROP_RUNNER] = { "runner", "name", NULL, [PROP_RUNNER] = { .key1 = "runner", .key2 = "name", .default_str = NM_SETTING_TEAM_RUNNER_DEFAULT, },
{.default_str = NM_SETTING_TEAM_RUNNER_DEFAULT} }, [PROP_RUNNER_HWADDR_POLICY] = { .key1 = "runner", .key2 = "hwaddr_policy", },
[PROP_RUNNER_HWADDR_POLICY] = { "runner", "hwaddr_policy", NULL, 0 }, [PROP_RUNNER_TX_HASH] = { .key1 = "runner", .key2 = "tx_hash", },
[PROP_RUNNER_TX_HASH] = { "runner", "tx_hash", NULL, 0 }, [PROP_RUNNER_TX_BALANCER] = { .key1 = "runner", .key2 = "tx_balancer", .key3 = "name", },
[PROP_RUNNER_TX_BALANCER] = { "runner", "tx_balancer", "name", 0 }, [PROP_RUNNER_TX_BALANCER_INTERVAL] = { .key1 = "runner", .key2 = "tx_balancer", .key3 = "balancing_interval", .default_int = -1 },
[PROP_RUNNER_TX_BALANCER_INTERVAL] = { "runner", "tx_balancer", "balancing_interval", -1 }, [PROP_RUNNER_ACTIVE] = { .key1 = "runner", .key2 = "active", },
[PROP_RUNNER_ACTIVE] = { "runner", "active", NULL, 0 }, [PROP_RUNNER_FAST_RATE] = { .key1 = "runner", .key2 = "fast_rate", },
[PROP_RUNNER_FAST_RATE] = { "runner", "fast_rate", NULL, 0 }, [PROP_RUNNER_SYS_PRIO] = { .key1 = "runner", .key2 = "sys_prio", .default_int = -1, },
[PROP_RUNNER_SYS_PRIO] = { "runner", "sys_prio", NULL, -1 }, [PROP_RUNNER_MIN_PORTS] = { .key1 = "runner", .key2 = "min_ports", .default_int = -1, },
[PROP_RUNNER_MIN_PORTS] = { "runner", "min_ports", NULL, -1 }, [PROP_RUNNER_AGG_SELECT_POLICY] = { .key1 = "runner", .key2 = "agg_select_policy", },
[PROP_RUNNER_AGG_SELECT_POLICY] = { "runner", "agg_select_policy", NULL, 0 }, [PROP_LINK_WATCHERS] = { .key1 = "link_watch", },
[PROP_LINK_WATCHERS] = { "link_watch", NULL, NULL, 0 }
}; };
typedef struct { typedef struct {