diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-02 09:47:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-02 11:07:49 +0200 |
| commit | 9e7d555dafa7c50ec7ea89fb2918cc83d4788331 (patch) | |
| tree | adae8df3876599fa52ace122a1ee5a9b7388f31e | |
| parent | fd3d01117134338de6e4a9d462beb5892d17d311 (diff) | |
| download | NetworkManager-9e7d555dafa7c50ec7ea89fb2918cc83d4788331.tar.gz | |
fixup! auth-utils: some refactoring in nm-auth-utils.c
| -rw-r--r-- | src/nm-auth-utils.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index e9bee59508..8c1c4dac4a 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -140,16 +140,22 @@ nm_auth_chain_new_subject (NMAuthSubject *subject, return self; } -gpointer -nm_auth_chain_get_data (NMAuthChain *self, const char *tag) +static gpointer +_get_data (NMAuthChain *self, const char *tag) { ChainData *tmp; + tmp = g_hash_table_lookup (self->data, tag); + return tmp ? tmp->data : NULL; +} + +gpointer +nm_auth_chain_get_data (NMAuthChain *self, const char *tag) +{ g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (tag != NULL, NULL); - tmp = g_hash_table_lookup (self->data, tag); - return tmp ? tmp->data : NULL; + return _get_data (self, tag); } /** @@ -205,16 +211,15 @@ nm_auth_chain_set_data (NMAuthChain *self, gulong nm_auth_chain_get_data_ulong (NMAuthChain *self, const char *tag) { - gulong *ptr; + gulong *data; g_return_val_if_fail (self != NULL, 0); g_return_val_if_fail (tag != NULL, 0); - ptr = g_hash_table_lookup (self->data, tag); - return ptr ? *ptr : 0ul; + data = _get_data (self, tag); + return data ? *data : 0ul; } - void nm_auth_chain_set_data_ulong (NMAuthChain *self, const char *tag, @@ -241,13 +246,13 @@ nm_auth_chain_get_subject (NMAuthChain *self) NMAuthCallResult nm_auth_chain_get_result (NMAuthChain *self, const char *permission) { - gpointer result; + gpointer data; g_return_val_if_fail (self != NULL, NM_AUTH_CALL_RESULT_UNKNOWN); g_return_val_if_fail (permission != NULL, NM_AUTH_CALL_RESULT_UNKNOWN); - result = g_hash_table_lookup (self->data, permission); - return result ? GPOINTER_TO_UINT (result) : NM_AUTH_CALL_RESULT_UNKNOWN; + data = _get_data (self, permission); + return data ? GPOINTER_TO_UINT (data) : NM_AUTH_CALL_RESULT_UNKNOWN; } static AuthCall * |