summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libnm-glib/nm-access-point.c4
-rw-r--r--libnm-glib/nm-ip4-config.c4
-rw-r--r--libnm-glib/nm-ip6-config.c4
-rw-r--r--libnm-util/nm-connection.c2
-rw-r--r--libnm-util/nm-setting-ip4-config.c4
-rw-r--r--src/dhcp-manager/nm-dhcp-dhclient.c6
-rw-r--r--src/dns-manager/nm-dns-bind.c2
-rw-r--r--src/nm-activation-request.c2
-rw-r--r--src/nm-device-ethernet.c2
-rw-r--r--src/nm-device.c2
-rw-r--r--src/nm-ip4-config.c2
-rw-r--r--src/nm-ip6-config.c2
-rw-r--r--src/settings/nm-settings.c2
-rw-r--r--src/settings/nm-system-config-interface.c4
-rw-r--r--src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/plugin.c2
-rw-r--r--src/supplicant-manager/nm-supplicant-interface.c4
17 files changed, 25 insertions, 25 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 89c4eb2a4c..e57f078670 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -434,9 +434,9 @@ nm_access_point_filter_connections (NMAccessPoint *ap, const GSList *connections
setting_mode = nm_setting_wireless_get_mode (s_wifi);
if (setting_mode && ap_mode) {
if (!strcmp (setting_mode, "infrastructure") && (ap_mode != NM_802_11_MODE_INFRA))
- return FALSE;
+ return NULL;
if (!strcmp (setting_mode, "adhoc") && (ap_mode != NM_802_11_MODE_ADHOC))
- return FALSE;
+ return NULL;
}
/* Band and Channel/Frequency */
diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c
index d63bc5dd4e..9f6096a405 100644
--- a/libnm-glib/nm-ip4-config.c
+++ b/libnm-glib/nm-ip4-config.c
@@ -329,7 +329,7 @@ nm_ip4_config_get_addresses (NMIP4Config *config)
NMIP4ConfigPrivate *priv;
GValue value = { 0, };
- g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0);
+ g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
if (priv->addresses)
@@ -479,7 +479,7 @@ nm_ip4_config_get_routes (NMIP4Config *config)
NMIP4ConfigPrivate *priv;
GValue value = { 0, };
- g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0);
+ g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
if (priv->routes)
diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c
index 06b9ba60e3..7e9bf3cd8a 100644
--- a/libnm-glib/nm-ip6-config.c
+++ b/libnm-glib/nm-ip6-config.c
@@ -156,7 +156,7 @@ nm_ip6_config_get_addresses (NMIP6Config *config)
NMIP6ConfigPrivate *priv;
GValue value = { 0, };
- g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0);
+ g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
priv = NM_IP6_CONFIG_GET_PRIVATE (config);
if (priv->addresses)
@@ -266,7 +266,7 @@ nm_ip6_config_get_routes (NMIP6Config *config)
NMIP6ConfigPrivate *priv;
GValue value = { 0, };
- g_return_val_if_fail (NM_IS_IP6_CONFIG (config), 0);
+ g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
priv = NM_IP6_CONFIG_GET_PRIVATE (config);
if (priv->routes)
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index b42f91725c..473acd24bb 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -1091,7 +1091,7 @@ nm_connection_new_from_hash (GHashTable *hash, GError **error)
g_return_val_if_fail (hash != NULL, NULL);
if (!validate_permissions_type (hash, error))
- return FALSE;
+ return NULL;
connection = nm_connection_new ();
g_hash_table_foreach (hash, parse_one_setting, connection);
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 7816e21c02..6961050d96 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -415,7 +415,7 @@ nm_setting_ip4_config_get_ignore_auto_dns (NMSettingIP4Config *setting)
const char *
nm_setting_ip4_config_get_dhcp_client_id (NMSettingIP4Config *setting)
{
- g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (setting), FALSE);
+ g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (setting), NULL);
return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->dhcp_client_id;
}
@@ -431,7 +431,7 @@ nm_setting_ip4_config_get_dhcp_send_hostname (NMSettingIP4Config *setting)
const char *
nm_setting_ip4_config_get_dhcp_hostname (NMSettingIP4Config *setting)
{
- g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (setting), FALSE);
+ g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (setting), NULL);
return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->dhcp_hostname;
}
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 75684459f6..88136a9008 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -353,7 +353,7 @@ create_dhclient_config (const char *iface,
GError *error = NULL;
gboolean success = FALSE;
- g_return_val_if_fail (iface != NULL, FALSE);
+ g_return_val_if_fail (iface != NULL, NULL);
#if defined(TARGET_SUSE)
orig = g_strdup (SYSCONFDIR "/dhclient.conf");
@@ -369,7 +369,7 @@ create_dhclient_config (const char *iface,
if (!orig) {
nm_log_warn (LOGD_DHCP, "(%s): not enough memory for dhclient options.", iface);
- return FALSE;
+ return NULL;
}
#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO)
@@ -379,7 +379,7 @@ create_dhclient_config (const char *iface,
orig = g_strdup_printf (SYSCONFDIR "/dhcp/dhclient-%s.conf", iface);
if (!orig) {
nm_log_warn (LOGD_DHCP, "(%s): not enough memory for dhclient options.", iface);
- return FALSE;
+ return NULL;
}
}
#endif
diff --git a/src/dns-manager/nm-dns-bind.c b/src/dns-manager/nm-dns-bind.c
index 9e3fc1739e..fc7af77641 100644
--- a/src/dns-manager/nm-dns-bind.c
+++ b/src/dns-manager/nm-dns-bind.c
@@ -190,7 +190,7 @@ find_zone (GPtrArray *zones, const char *domain)
{
guint32 dhash, i;
- g_return_val_if_fail (domain != NULL, FALSE);
+ g_return_val_if_fail (domain != NULL, NULL);
dhash = g_str_hash (domain);
for (i = 0; i < zones->len; i++) {
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index d36ee8d41e..ed4ae596b0 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -286,7 +286,7 @@ nm_act_request_get_default6 (NMActRequest *req)
GObject *
nm_act_request_get_device (NMActRequest *req)
{
- g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
+ g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NULL);
return G_OBJECT (NM_ACT_REQUEST_GET_PRIVATE (req)->device);
}
diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c
index 284df271a0..e881c37035 100644
--- a/src/nm-device-ethernet.c
+++ b/src/nm-device-ethernet.c
@@ -2158,7 +2158,7 @@ supports_mii_carrier_detect (NMDeviceEthernet *self)
fd = socket (PF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
nm_log_err (LOGD_HW, "couldn't open control socket.");
- return 0;
+ return FALSE;
}
memset (&ifr, 0, sizeof (struct ifreq));
diff --git a/src/nm-device.c b/src/nm-device.c
index a1e451c5ab..4975a7981c 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -3874,7 +3874,7 @@ spec_match_list (NMDeviceInterface *device, const GSList *specs)
static NMConnection *
connection_match_config (NMDeviceInterface *device, const GSList *connections)
{
- g_return_val_if_fail (device != NULL, FALSE);
+ g_return_val_if_fail (device != NULL, NULL);
if (NM_DEVICE_GET_CLASS (device)->connection_match_config)
return NM_DEVICE_GET_CLASS (device)->connection_match_config (NM_DEVICE (device), connections);
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 0ae3d1bee4..ef284d80ee 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -121,7 +121,7 @@ nm_ip4_config_export (NMIP4Config *config)
const char *
nm_ip4_config_get_dbus_path (NMIP4Config *config)
{
- g_return_val_if_fail (NM_IS_IP4_CONFIG (config), FALSE);
+ g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
return NM_IP4_CONFIG_GET_PRIVATE (config)->path;
}
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 4c6c5c6273..2f231638f5 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -114,7 +114,7 @@ nm_ip6_config_export (NMIP6Config *config)
const char *
nm_ip6_config_get_dbus_path (NMIP6Config *config)
{
- g_return_val_if_fail (NM_IS_IP6_CONFIG (config), FALSE);
+ g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
return NM_IP6_CONFIG_GET_PRIVATE (config)->path;
}
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 6f8cc15ff5..44bed1fd6c 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -491,7 +491,7 @@ find_plugin (GSList *list, const char *pname)
GSList *iter;
GObject *obj = NULL;
- g_return_val_if_fail (pname != NULL, FALSE);
+ g_return_val_if_fail (pname != NULL, NULL);
for (iter = list; iter && !obj; iter = g_slist_next (iter)) {
NMSystemConfigInterface *plugin = NM_SYSTEM_CONFIG_INTERFACE (iter->data);
diff --git a/src/settings/nm-system-config-interface.c b/src/settings/nm-system-config-interface.c
index 0533ff33c0..45aa6305da 100644
--- a/src/settings/nm-system-config-interface.c
+++ b/src/settings/nm-system-config-interface.c
@@ -152,8 +152,8 @@ nm_system_config_interface_add_connection (NMSystemConfigInterface *config,
NMConnection *connection,
GError **error)
{
- g_return_val_if_fail (config != NULL, FALSE);
- g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
+ g_return_val_if_fail (config != NULL, NULL);
+ g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->add_connection)
return NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->add_connection (config, connection, error);
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 52c172dae4..433f933bb5 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -173,7 +173,7 @@ nm_ifcfg_connection_get_path (NMIfcfgConnection *self)
const char *
nm_ifcfg_connection_get_unmanaged_spec (NMIfcfgConnection *self)
{
- g_return_val_if_fail (NM_IS_IFCFG_CONNECTION (self), FALSE);
+ g_return_val_if_fail (NM_IS_IFCFG_CONNECTION (self), NULL);
return NM_IFCFG_CONNECTION_GET_PRIVATE (self)->unmanaged;
}
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index 958a93a26c..24cad38237 100644
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -465,7 +465,7 @@ plugin_get_hostname (SCPluginIfcfg *plugin)
network = svNewFile (SC_NETWORK_FILE);
if (!network) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not get hostname: failed to read " SC_NETWORK_FILE);
- return FALSE;
+ return NULL;
}
hostname = svGetValue (network, "HOSTNAME", FALSE);
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 93807b9360..e46174c777 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -998,8 +998,8 @@ nm_supplicant_interface_get_object_path (NMSupplicantInterface *self)
const char *
nm_supplicant_interface_get_ifname (NMSupplicantInterface *self)
{
- g_return_val_if_fail (self != NULL, FALSE);
- g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), FALSE);
+ g_return_val_if_fail (self != NULL, NULL);
+ g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), NULL);
return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->dev;
}
View Lorry Controller Status