fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 22:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: do not create a copy of static strings for nmc_properties hash

Browse source 
The keys of the hash are static strings. No need to make a copy of it.
If we ever need dynamics properties, we should intern those strings.

(cherry picked from commit 16f089ce64)
This commit is contained in:
Thomas Haller 2015-05-21 13:22:16 +02:00
parent b81bbc134c
commit 8d6cced2c5
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/cli/settings.c
View file

@ -4709,13 +4709,13 @@ DEFINE_ALLOWED_VAL_FUNC (nmc_property_dcb_allowed_app_fcoe_modes, _dcb_valid_fco
/*----------------------------------------------------------------------------*/
static void
nmc_add_prop_funcs (char *key,
NmcPropertyGetFunc get_func,
NmcPropertySetFunc set_func,
NmcPropertyRemoveFunc remove_func,
NmcPropertyDescribeFunc describe_func,
NmcPropertyValuesFunc values_func,
gpointer dummy)
_nmc_add_prop_funcs (const char *key,
NmcPropertyGetFunc get_func,
NmcPropertySetFunc set_func,
NmcPropertyRemoveFunc remove_func,
NmcPropertyDescribeFunc describe_func,
NmcPropertyValuesFunc values_func,
gpointer dummy)
{
NmcPropertyFuncs *item = g_malloc0 (sizeof (NmcPropertyFuncs));
item->get_func = get_func;
@ -4724,12 +4724,14 @@ nmc_add_prop_funcs (char *key,
item->describe_func = describe_func;
item->values_func = values_func;
g_hash_table_insert (nmc_properties, key, item);
g_hash_table_insert (nmc_properties, (gpointer) key, item);
}
#define nmc_add_prop_funcs(key, ...) _nmc_add_prop_funcs ("" key, __VA_ARGS__)
/* concatenate setting name and property name */
#define GLUE(A,B) (g_strconcat ((NM_SETTING_##A##_SETTING_NAME),(NM_SETTING_##A##_##B), NULL))
#define GLUE_IP(A,B) (g_strconcat ((NM_SETTING_IP##A##_CONFIG_SETTING_NAME),(NM_SETTING_IP_CONFIG_##B), NULL))
#define GLUE(A,B) "" NM_SETTING_##A##_SETTING_NAME "" NM_SETTING_##A##_##B ""
#define GLUE_IP(A,B) "" NM_SETTING_IP##A##_CONFIG_SETTING_NAME "" NM_SETTING_IP_CONFIG_##B ""
void
nmc_properties_init (void)
@ -4738,7 +4740,7 @@ nmc_properties_init (void)
return;
/* create properties hash table */
nmc_properties = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
nmc_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
/* Add editable properties for NM_SETTING_802_1X_SETTING_NAME */
nmc_add_prop_funcs (GLUE (802_1X, EAP),