diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-12-05 15:08:17 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-12-10 07:53:25 +0100 |
| commit | b7462b1910b5b3debbeb208f82de3d4d3f92f224 (patch) | |
| tree | 6cf318554243833916ee5b84d7f49d3511c6925f | |
| parent | bfdd352a616471532b96c2e03554ebaf5125998e (diff) | |
| download | NetworkManager-b7462b1910b5b3debbeb208f82de3d4d3f92f224.tar.gz | |
libnm,shared: move nm_permission_result_to_client() to shared's nm_client_permission_result_from_string()
| -rw-r--r-- | libnm/nm-client.c | 2 | ||||
| -rw-r--r-- | libnm/nm-libnm-utils.c | 16 | ||||
| -rw-r--r-- | libnm/nm-libnm-utils.h | 4 | ||||
| -rw-r--r-- | shared/nm-libnm-core-intern/nm-libnm-core-utils.c | 16 | ||||
| -rw-r--r-- | shared/nm-libnm-core-intern/nm-libnm-core-utils.h | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c index f81cbb0695..42cba4095d 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -3379,7 +3379,7 @@ _dbus_check_permissions_start_cb (GObject *source, GAsyncResult *result, gpointe if (perm == NM_CLIENT_PERMISSION_NONE) continue; - perm_result = nm_permission_result_to_client (pvalue); + perm_result = nm_client_permission_result_from_string (pvalue); g_hash_table_insert (priv->permissions, GUINT_TO_POINTER (perm), diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index 7fd6eafb07..662bc33fa5 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -663,22 +663,6 @@ nm_utils_fixup_product_string (const char *desc) /*****************************************************************************/ -NMClientPermissionResult -nm_permission_result_to_client (const char *nm) -{ - if (!nm) - return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; - if (nm_streq (nm, "yes")) - return NM_CLIENT_PERMISSION_RESULT_YES; - if (nm_streq (nm, "no")) - return NM_CLIENT_PERMISSION_RESULT_NO; - if (nm_streq (nm, "auth")) - return NM_CLIENT_PERMISSION_RESULT_AUTH; - return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; -} - -/*****************************************************************************/ - const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[] = { &_nml_dbus_meta_iface_nm, &_nml_dbus_meta_iface_nm_accesspoint, diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 5ab10fcfeb..304c35f4be 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -29,10 +29,6 @@ gboolean nm_utils_g_param_spec_is_default (const GParamSpec *pspec); /*****************************************************************************/ -NMClientPermissionResult nm_permission_result_to_client (const char *nm); - -/*****************************************************************************/ - typedef enum { _NML_DBUS_LOG_LEVEL_INITIALIZED = 0x01, diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c index 366d812a31..087524bdd4 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c @@ -149,3 +149,19 @@ nm_auth_permission_from_string (const char *str) return NM_CLIENT_PERMISSION_NONE; return nm_auth_permission_sorted[idx]; } + +/*****************************************************************************/ + +NMClientPermissionResult +nm_client_permission_result_from_string (const char *nm) +{ + if (!nm) + return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; + if (nm_streq (nm, "yes")) + return NM_CLIENT_PERMISSION_RESULT_YES; + if (nm_streq (nm, "no")) + return NM_CLIENT_PERMISSION_RESULT_NO; + if (nm_streq (nm, "auth")) + return NM_CLIENT_PERMISSION_RESULT_AUTH; + return NM_CLIENT_PERMISSION_RESULT_UNKNOWN; +} diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h index 3e15394ea9..398c493d9d 100644 --- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h +++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h @@ -103,4 +103,8 @@ extern const NMClientPermission nm_auth_permission_sorted[NM_CLIENT_PERMISSION_L const char *nm_auth_permission_to_string (NMClientPermission permission); NMClientPermission nm_auth_permission_from_string (const char *str); +/*****************************************************************************/ + +NMClientPermissionResult nm_client_permission_result_from_string (const char *nm); + #endif /* __NM_LIBNM_SHARED_UTILS_H__ */ |