mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-06 01:10:33 +01:00
libnm: drop nm_utils_deinit()
It was a no-op anyway.
This commit is contained in:
parent
cb025dba5b
commit
926f4e1473
7 changed files with 3 additions and 38 deletions
|
|
@ -46,8 +46,6 @@ typedef enum {
|
|||
|
||||
gboolean crypto_init (GError **error);
|
||||
|
||||
void crypto_deinit (void);
|
||||
|
||||
GByteArray *crypto_decrypt_openssl_private_key_data (const guint8 *data,
|
||||
gsize data_len,
|
||||
const char *password,
|
||||
|
|
|
|||
|
|
@ -56,11 +56,6 @@ crypto_init (GError **error)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
crypto_deinit (void)
|
||||
{
|
||||
}
|
||||
|
||||
gboolean
|
||||
crypto_md5_hash (const char *salt,
|
||||
const gsize salt_len,
|
||||
|
|
|
|||
|
|
@ -72,11 +72,6 @@ crypto_init (GError **error)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
crypto_deinit (void)
|
||||
{
|
||||
}
|
||||
|
||||
gboolean
|
||||
crypto_md5_hash (const char *salt,
|
||||
const gsize salt_len,
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ get_encodings_for_lang (const char *lang,
|
|||
return success;
|
||||
}
|
||||
|
||||
/* init, deinit for libnm_util */
|
||||
/* init libnm */
|
||||
|
||||
static void __attribute__((constructor))
|
||||
_check_symbols (void)
|
||||
|
|
@ -231,9 +231,7 @@ static gboolean initialized = FALSE;
|
|||
* @error: location to store error, or %NULL
|
||||
*
|
||||
* Initializes libnm; should be called when starting and program that
|
||||
* uses libnm. Sets up an atexit() handler to ensure de-initialization
|
||||
* is performed, but calling nm_utils_deinit() to explicitly deinitialize
|
||||
* libnm can also be done. This function can be called more than once.
|
||||
* uses libnm. This function can be called more than once.
|
||||
*
|
||||
* Returns: %TRUE if the initialization was successful, %FALSE on failure.
|
||||
**/
|
||||
|
|
@ -254,23 +252,6 @@ nm_utils_init (GError **error)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* nm_utils_deinit:
|
||||
*
|
||||
* Frees all resources used internally by libnm. This function is called
|
||||
* from an atexit() handler, set up by nm_utils_init(), but is safe to be called
|
||||
* more than once. Subsequent calls have no effect until nm_utils_init() is
|
||||
* called again.
|
||||
**/
|
||||
void
|
||||
nm_utils_deinit (void)
|
||||
{
|
||||
if (initialized) {
|
||||
crypto_deinit ();
|
||||
initialized = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
gboolean _nm_utils_is_manager_process;
|
||||
|
||||
/* ssid helpers */
|
||||
|
|
|
|||
|
|
@ -39,9 +39,8 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* init, deinit nm_utils */
|
||||
/* init libnm */
|
||||
gboolean nm_utils_init (GError **error);
|
||||
void nm_utils_deinit (void);
|
||||
|
||||
/* SSID helpers */
|
||||
gboolean nm_utils_is_empty_ssid (const guint8 *ssid, gsize len);
|
||||
|
|
|
|||
|
|
@ -462,8 +462,6 @@ main (int argc, char **argv)
|
|||
|
||||
ret = g_test_run ();
|
||||
|
||||
crypto_deinit ();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -755,7 +755,6 @@ global:
|
|||
nm_utils_ap_mode_security_valid;
|
||||
nm_utils_bin2hexstr;
|
||||
nm_utils_check_virtual_device_compatibility;
|
||||
nm_utils_deinit;
|
||||
nm_utils_escape_ssid;
|
||||
nm_utils_file_is_certificate;
|
||||
nm_utils_file_is_pkcs12;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue