summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/nm-agent-manager.c3
-rw-r--r--src/settings/nm-default-wired-connection.c1
-rw-r--r--src/settings/nm-secret-agent.c6
-rw-r--r--src/settings/nm-settings-connection.c13
-rw-r--r--src/settings/nm-settings.c3
5 files changed, 0 insertions, 26 deletions
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index d9199f51c2..3256e1816c 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -1048,7 +1048,6 @@ nm_agent_manager_get_secrets (NMAgentManager *self,
Request *req;
g_return_val_if_fail (self != NULL, 0);
- g_return_val_if_fail (connection != NULL, 0);
g_return_val_if_fail (NM_IS_CONNECTION (connection), 0);
g_return_val_if_fail (callback != NULL, 0);
@@ -1179,7 +1178,6 @@ nm_agent_manager_save_secrets (NMAgentManager *self,
Request *req;
g_return_val_if_fail (self != NULL, 0);
- g_return_val_if_fail (connection != NULL, 0);
g_return_val_if_fail (NM_IS_CONNECTION (connection), 0);
nm_log_dbg (LOGD_SETTINGS,
@@ -1276,7 +1274,6 @@ nm_agent_manager_delete_secrets (NMAgentManager *self,
Request *req;
g_return_val_if_fail (self != NULL, 0);
- g_return_val_if_fail (connection != NULL, 0);
g_return_val_if_fail (NM_IS_CONNECTION (connection), 0);
nm_log_dbg (LOGD_SETTINGS,
diff --git a/src/settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c
index ff817b58b2..8d383c4115 100644
--- a/src/settings/nm-default-wired-connection.c
+++ b/src/settings/nm-default-wired-connection.c
@@ -105,7 +105,6 @@ nm_default_wired_connection_new (const GByteArray *mac,
g_return_val_if_fail (mac != NULL, NULL);
g_return_val_if_fail (mac->len == ETH_ALEN, NULL);
- g_return_val_if_fail (device != NULL, NULL);
g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
g_return_val_if_fail (defname != NULL, NULL);
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 6bbaf6d775..394aec7aea 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -100,7 +100,6 @@ nm_secret_agent_get_description (NMSecretAgent *agent)
{
NMSecretAgentPrivate *priv;
- g_return_val_if_fail (agent != NULL, NULL);
g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL);
priv = NM_SECRET_AGENT_GET_PRIVATE (agent);
@@ -117,7 +116,6 @@ nm_secret_agent_get_description (NMSecretAgent *agent)
const char *
nm_secret_agent_get_dbus_owner (NMSecretAgent *agent)
{
- g_return_val_if_fail (agent != NULL, NULL);
g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL);
return NM_SECRET_AGENT_GET_PRIVATE (agent)->owner;
@@ -126,7 +124,6 @@ nm_secret_agent_get_dbus_owner (NMSecretAgent *agent)
const char *
nm_secret_agent_get_identifier (NMSecretAgent *agent)
{
- g_return_val_if_fail (agent != NULL, NULL);
g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL);
return NM_SECRET_AGENT_GET_PRIVATE (agent)->identifier;
@@ -135,7 +132,6 @@ nm_secret_agent_get_identifier (NMSecretAgent *agent)
uid_t
nm_secret_agent_get_owner_uid (NMSecretAgent *agent)
{
- g_return_val_if_fail (agent != NULL, G_MAXUINT);
g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), G_MAXUINT);
return NM_SECRET_AGENT_GET_PRIVATE (agent)->owner_uid;
@@ -144,7 +140,6 @@ nm_secret_agent_get_owner_uid (NMSecretAgent *agent)
const char *
nm_secret_agent_get_owner_username(NMSecretAgent *agent)
{
- g_return_val_if_fail (agent != NULL, NULL);
g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL);
return NM_SECRET_AGENT_GET_PRIVATE (agent)->owner_username;
@@ -153,7 +148,6 @@ nm_secret_agent_get_owner_username(NMSecretAgent *agent)
guint32
nm_secret_agent_get_hash (NMSecretAgent *agent)
{
- g_return_val_if_fail (agent != NULL, 0);
g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), 0);
return NM_SECRET_AGENT_GET_PRIVATE (agent)->hash;
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index d3415862d6..59c85ccc41 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -205,7 +205,6 @@ set_visible (NMSettingsConnection *self, gboolean new_visible)
gboolean
nm_settings_connection_is_visible (NMSettingsConnection *self)
{
- g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE);
return NM_SETTINGS_CONNECTION_GET_PRIVATE (self)->visible;
@@ -218,7 +217,6 @@ nm_settings_connection_recheck_visibility (NMSettingsConnection *self)
NMSettingConnection *s_con;
guint32 num, i;
- g_return_if_fail (self != NULL);
g_return_if_fail (NM_IS_SETTINGS_CONNECTION (self));
priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
@@ -269,7 +267,6 @@ nm_settings_connection_check_permission (NMSettingsConnection *self,
guint32 num, i;
const char *puser;
- g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE);
priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
@@ -383,9 +380,7 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self,
GHashTable *new_settings, *hash = NULL;
gboolean success = FALSE;
- g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE);
- g_return_val_if_fail (new != NULL, FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (new), FALSE);
priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self);
@@ -436,9 +431,7 @@ nm_settings_connection_replace_and_commit (NMSettingsConnection *self,
{
GError *error = NULL;
- g_return_if_fail (self != NULL);
g_return_if_fail (NM_IS_SETTINGS_CONNECTION (self));
- g_return_if_fail (new != NULL);
g_return_if_fail (NM_IS_CONNECTION (new));
if (!callback)
@@ -465,7 +458,6 @@ nm_settings_connection_commit_changes (NMSettingsConnection *connection,
NMSettingsConnectionCommitFunc callback,
gpointer user_data)
{
- g_return_if_fail (connection != NULL);
g_return_if_fail (NM_IS_SETTINGS_CONNECTION (connection));
g_return_if_fail (callback != NULL);
@@ -487,7 +479,6 @@ nm_settings_connection_delete (NMSettingsConnection *connection,
NMSettingsConnectionDeleteFunc callback,
gpointer user_data)
{
- g_return_if_fail (connection != NULL);
g_return_if_fail (NM_IS_SETTINGS_CONNECTION (connection));
g_return_if_fail (callback != NULL);
@@ -1021,7 +1012,6 @@ check_writable (NMConnection *connection, GError **error)
{
NMSettingConnection *s_con;
- g_return_val_if_fail (connection != NULL, FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
s_con = nm_connection_get_setting_connection (connection);
@@ -1426,7 +1416,6 @@ gboolean
nm_settings_connection_get_timestamp (NMSettingsConnection *connection,
guint64 *out_timestamp)
{
- g_return_val_if_fail (connection != NULL, 0);
g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), 0);
if (out_timestamp)
@@ -1572,7 +1561,6 @@ nm_settings_connection_get_seen_bssids (NMSettingsConnection *connection)
char *bssid_str;
GSList *bssid_list = NULL;
- g_return_val_if_fail (connection != NULL, 0);
g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), NULL);
g_hash_table_iter_init (&iter, priv->seen_bssids);
@@ -1593,7 +1581,6 @@ gboolean
nm_settings_connection_has_seen_bssid (NMSettingsConnection *connection,
const struct ether_addr *bssid)
{
- g_return_val_if_fail (connection != NULL, FALSE);
g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), FALSE);
g_return_val_if_fail (bssid != NULL, FALSE);
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index b04016116f..4e98744a61 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -203,7 +203,6 @@ nm_settings_for_each_connection (NMSettings *self,
GHashTableIter iter;
gpointer data;
- g_return_if_fail (self != NULL);
g_return_if_fail (NM_IS_SETTINGS (self));
g_return_if_fail (for_each_func != NULL);
@@ -241,7 +240,6 @@ nm_settings_get_connection_by_uuid (NMSettings *self, const char *uuid)
NMSettingsConnection *candidate;
GHashTableIter iter;
- g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (NM_IS_SETTINGS (self), NULL);
g_return_val_if_fail (uuid != NULL, NULL);
@@ -331,7 +329,6 @@ nm_settings_get_connection_by_path (NMSettings *self, const char *path)
{
NMSettingsPrivate *priv;
- g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (NM_IS_SETTINGS (self), NULL);
g_return_val_if_fail (path != NULL, NULL);
View Lorry Controller Status