system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 12:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: drop unnecessary cast of g_object_new()

Browse source 
Our cast macros (like NM_AUTH_SUBJECT()) are plain C pointer casts,
unless when building with more asserts enabled.

Still, they are unnecessary and even their ability to check the type
(with more asserts) is not needed, because we must trust glib's
g_object_new() to return reasonable objects. That is a basic
requirement, that we don't need to assert against.

Also, in the majority of cases we don't do this either.
This commit is contained in:
Thomas Haller 2021-02-08 16:55:35 +01:00
parent 0177cb9ade
commit 60800b33b4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
6 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libnm-core/nm-libnm-core-intern/nm-auth-subject.c
View file

@ -179,10 +179,10 @@ nm_auth_subject_get_unix_session_id(NMAuthSubject *subject)
NMAuthSubject *
nm_auth_subject_new_internal(void)
{
return NM_AUTH_SUBJECT(g_object_new(NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE,
(int) NM_AUTH_SUBJECT_TYPE_INTERNAL,
NULL));
return g_object_new(NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE,
(int) NM_AUTH_SUBJECT_TYPE_INTERNAL,
NULL);
}
/**
@ -195,12 +195,12 @@ nm_auth_subject_new_internal(void)
NMAuthSubject *
nm_auth_subject_new_unix_session(const char *session_id)
{
return NM_AUTH_SUBJECT(g_object_new(NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE,
(int) NM_AUTH_SUBJECT_TYPE_UNIX_SESSION,
NM_AUTH_SUBJECT_UNIX_SESSION_ID,
session_id,
NULL));
return g_object_new(NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE,
(int) NM_AUTH_SUBJECT_TYPE_UNIX_SESSION,
NM_AUTH_SUBJECT_UNIX_SESSION_ID,
session_id,
NULL);
}
/**
@ -213,16 +213,16 @@ nm_auth_subject_new_unix_session(const char *session_id)
NMAuthSubject *
nm_auth_subject_new_unix_process(const char *dbus_sender, gulong pid, gulong uid)
{
return NM_AUTH_SUBJECT(g_object_new(NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE,
(int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
NM_AUTH_SUBJECT_UNIX_PROCESS_DBUS_SENDER,
dbus_sender,
NM_AUTH_SUBJECT_UNIX_PROCESS_PID,
pid,
NM_AUTH_SUBJECT_UNIX_PROCESS_UID,
uid,
NULL));
return g_object_new(NM_TYPE_AUTH_SUBJECT,
NM_AUTH_SUBJECT_SUBJECT_TYPE,
(int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS,
NM_AUTH_SUBJECT_UNIX_PROCESS_DBUS_SENDER,
dbus_sender,
NM_AUTH_SUBJECT_UNIX_PROCESS_PID,
pid,
NM_AUTH_SUBJECT_UNIX_PROCESS_UID,
uid,
NULL);
}
/**

2
libnm-core/tests/test-general.c
View file

@ -5486,7 +5486,7 @@ _test_connection_normalize_type_normalizable_type(const char *type,
if (add_setting_fcn)
s_base = add_setting_fcn(con);
else {
s_base = NM_SETTING(g_object_new(base_type, NULL));
s_base = g_object_new(base_type, NULL);
nm_connection_add_setting(con, s_base);
}

60
src/core/devices/wifi/nm-iwd-manager.c
View file

@ -615,27 +615,27 @@ mirror_connection(NMIwdManager * self,
connection = nm_simple_connection_new();
setting = NM_SETTING(g_object_new(NM_TYPE_SETTING_CONNECTION,
NM_SETTING_CONNECTION_TYPE,
NM_SETTING_WIRELESS_SETTING_NAME,
NM_SETTING_CONNECTION_ID,
id->name,
NM_SETTING_CONNECTION_UUID,
nm_utils_uuid_generate_buf(uuid),
NM_SETTING_CONNECTION_AUTOCONNECT,
autoconnectable,
NULL));
setting = g_object_new(NM_TYPE_SETTING_CONNECTION,
NM_SETTING_CONNECTION_TYPE,
NM_SETTING_WIRELESS_SETTING_NAME,
NM_SETTING_CONNECTION_ID,
id->name,
NM_SETTING_CONNECTION_UUID,
nm_utils_uuid_generate_buf(uuid),
NM_SETTING_CONNECTION_AUTOCONNECT,
autoconnectable,
NULL);
nm_connection_add_setting(connection, setting);
new_ssid = g_bytes_new(id->name, ssid_len);
setting = NM_SETTING(g_object_new(NM_TYPE_SETTING_WIRELESS,
NM_SETTING_WIRELESS_SSID,
new_ssid,
NM_SETTING_WIRELESS_MODE,
NM_SETTING_WIRELESS_MODE_INFRA,
NM_SETTING_WIRELESS_HIDDEN,
hidden,
NULL));
setting = g_object_new(NM_TYPE_SETTING_WIRELESS,
NM_SETTING_WIRELESS_SSID,
new_ssid,
NM_SETTING_WIRELESS_MODE,
NM_SETTING_WIRELESS_MODE_INFRA,
NM_SETTING_WIRELESS_HIDDEN,
hidden,
NULL);
nm_connection_add_setting(connection, setting);
switch (id->security) {
@ -654,12 +654,12 @@ mirror_connection(NMIwdManager * self,
}
if (key_mgmt) {
setting = NM_SETTING(g_object_new(NM_TYPE_SETTING_WIRELESS_SECURITY,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
"open",
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
key_mgmt,
NULL));
setting = g_object_new(NM_TYPE_SETTING_WIRELESS_SECURITY,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
"open",
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
key_mgmt,
NULL);
nm_connection_add_setting(connection, setting);
}
@ -670,12 +670,12 @@ mirror_connection(NMIwdManager * self,
* NM settings. The saved values can not be used anyway because of our
* use of NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW.
*/
setting = NM_SETTING(g_object_new(NM_TYPE_SETTING_802_1X,
NM_SETTING_802_1X_PASSWORD_FLAGS,
NM_SETTING_SECRET_FLAG_NOT_SAVED,
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS,
NM_SETTING_SECRET_FLAG_NOT_SAVED,
NULL));
setting = g_object_new(NM_TYPE_SETTING_802_1X,
NM_SETTING_802_1X_PASSWORD_FLAGS,
NM_SETTING_SECRET_FLAG_NOT_SAVED,
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS,
NM_SETTING_SECRET_FLAG_NOT_SAVED,
NULL);
nm_setting_802_1x_add_eap_method(NM_SETTING_802_1X(setting), "external");
nm_connection_add_setting(connection, setting);
}

2
src/core/nm-core-utils.h
View file

@ -54,7 +54,7 @@ void _nm_singleton_instance_register_destruction(GObject *instance);
if (G_UNLIKELY(!singleton_instance)) { \
g_assert(!(_already_created_##GETTER) || (NM_DEFINE_SINGLETON_ALLOW_MULTIPLE)); \
(_already_created_##GETTER) = TRUE; \
singleton_instance = (g_object_new(GTYPE, ##__VA_ARGS__, NULL)); \
singleton_instance = g_object_new(GTYPE, ##__VA_ARGS__, NULL); \
g_assert(singleton_instance); \
nm_singleton_instance_register(); \
nm_log_dbg(LOGD_CORE, \

2
src/core/nm-proxy-config.c
View file

@ -148,7 +148,7 @@ nm_proxy_config_init(NMProxyConfig *config)
NMProxyConfig *
nm_proxy_config_new(void)
{
return NM_PROXY_CONFIG(g_object_new(NM_TYPE_PROXY_CONFIG, NULL));
return g_object_new(NM_TYPE_PROXY_CONFIG, NULL);
}
static void

2
src/core/nm-rfkill-manager.c
View file

@ -391,7 +391,7 @@ nm_rfkill_manager_init(NMRfkillManager *self)
NMRfkillManager *
nm_rfkill_manager_new(void)
{
return NM_RFKILL_MANAGER(g_object_new(NM_TYPE_RFKILL_MANAGER, NULL));
return g_object_new(NM_TYPE_RFKILL_MANAGER, NULL);
}
static void