summaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bluetooth/nm-bluez-manager.c4
-rw-r--r--src/devices/bluetooth/nm-bluez5-manager.c8
-rw-r--r--src/devices/nm-device.c14
-rw-r--r--src/devices/team/nm-device-team.c12
-rw-r--r--src/devices/wifi/nm-device-iwd.c40
-rw-r--r--src/devices/wifi/nm-device-wifi.c2
-rw-r--r--src/devices/wifi/nm-iwd-manager.c28
-rw-r--r--src/devices/wifi/nm-iwd-manager.h4
-rw-r--r--src/devices/wifi/nm-wifi-ap.c2
-rw-r--r--src/devices/wifi/nm-wifi-utils.c2
-rw-r--r--src/devices/wifi/nm-wifi-utils.h2
-rw-r--r--src/devices/wifi/tests/test-general.c6
-rw-r--r--src/devices/wwan/nm-modem-broadband.c14
-rw-r--r--src/devices/wwan/nm-modem-manager.c14
-rw-r--r--src/devices/wwan/nm-modem-ofono.c4
-rw-r--r--src/devices/wwan/nm-modem.c2
-rw-r--r--src/devices/wwan/nm-modem.h2
17 files changed, 80 insertions, 80 deletions
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index c74ecd8195..711f2e5786 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -244,8 +244,8 @@ setup_bluez5 (NMBluezManager *self)
static void
watch_name_on_appeared (GDBusConnection *connection,
- const gchar *name,
- const gchar *name_owner,
+ const char *name,
+ const char *name_owner,
gpointer user_data)
{
check_bluez_and_try_setup (NM_BLUEZ_MANAGER (user_data));
diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c
index 5d3bd23a9e..e984212bb6 100644
--- a/src/devices/bluetooth/nm-bluez5-manager.c
+++ b/src/devices/bluetooth/nm-bluez5-manager.c
@@ -224,7 +224,7 @@ network_server_unregister_bridge (const NMBtVTableNetworkServer *vtable,
}
static void
-network_server_removed (GDBusProxy *proxy, const gchar *path, NMBluez5Manager *self)
+network_server_removed (GDBusProxy *proxy, const char *path, NMBluez5Manager *self)
{
NetworkServer *network_server;
@@ -241,7 +241,7 @@ network_server_removed (GDBusProxy *proxy, const gchar *path, NMBluez5Manager *s
}
static void
-network_server_added (GDBusProxy *proxy, const gchar *path, const char *addr, NMBluez5Manager *self)
+network_server_added (GDBusProxy *proxy, const char *path, const char *addr, NMBluez5Manager *self)
{
NMBluez5ManagerPrivate *priv = NM_BLUEZ5_MANAGER_GET_PRIVATE (self);
NetworkServer *network_server;
@@ -342,7 +342,7 @@ device_initialized (NMBluezDevice *device, gboolean success, NMBluez5Manager *se
}
static void
-device_added (GDBusProxy *proxy, const gchar *path, NMBluez5Manager *self)
+device_added (GDBusProxy *proxy, const char *path, NMBluez5Manager *self)
{
NMBluez5ManagerPrivate *priv = NM_BLUEZ5_MANAGER_GET_PRIVATE (self);
NMBluezDevice *device;
@@ -356,7 +356,7 @@ device_added (GDBusProxy *proxy, const gchar *path, NMBluez5Manager *self)
}
static void
-device_removed (GDBusProxy *proxy, const gchar *path, NMBluez5Manager *self)
+device_removed (GDBusProxy *proxy, const char *path, NMBluez5Manager *self)
{
NMBluez5ManagerPrivate *priv = NM_BLUEZ5_MANAGER_GET_PRIVATE (self);
NMBluezDevice *device;
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index d646493a5c..aa2a389a5d 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -614,7 +614,7 @@ static void _set_state_full (NMDevice *self,
static void queued_state_clear (NMDevice *device);
static gboolean queued_ip4_config_change (gpointer user_data);
static gboolean queued_ip6_config_change (gpointer user_data);
-static void ip_check_ping_watch_cb (GPid pid, gint status, gpointer user_data);
+static void ip_check_ping_watch_cb (GPid pid, int status, gpointer user_data);
static gboolean ip_config_valid (NMDeviceState state);
static NMActStageReturn dhcp4_start (NMDevice *self);
static gboolean dhcp6_start (NMDevice *self, gboolean wait_for_ll);
@@ -1018,7 +1018,7 @@ static void
init_ip_config_dns_priority (NMDevice *self, NMIPConfig *config)
{
gs_free char *value = NULL;
- gint priority;
+ int priority;
value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA,
(nm_ip_config_get_addr_family (config) == AF_INET)
@@ -6180,7 +6180,7 @@ get_ipv4_dad_timeout (NMDevice *self)
NMConnection *connection;
NMSettingIPConfig *s_ip4 = NULL;
gs_free char *value = NULL;
- gint ret = 0;
+ int ret = 0;
connection = nm_device_get_applied_connection (self);
if (connection)
@@ -11711,11 +11711,11 @@ spawn_ping (NMDevice *self)
gboolean ret;
args[6] = str_timeout = g_strdup_printf ("%u", priv->gw_ping.deadline);
- tmp_str = g_strjoinv (" ", (gchar **) args);
+ tmp_str = g_strjoinv (" ", (char **) args);
_LOGD (priv->gw_ping.log_domain, "ping: running '%s'", tmp_str);
ret = g_spawn_async ("/",
- (gchar **) args,
+ (char **) args,
NULL,
G_SPAWN_DO_NOT_REAP_CHILD,
NULL,
@@ -11751,7 +11751,7 @@ respawn_ping_cb (gpointer user_data)
}
static void
-ip_check_ping_watch_cb (GPid pid, gint status, gpointer user_data)
+ip_check_ping_watch_cb (GPid pid, int status, gpointer user_data)
{
NMDevice *self = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
@@ -15182,7 +15182,7 @@ nm_device_get_supplicant_timeout (NMDevice *self)
NMConnection *connection;
NMSetting8021x *s_8021x;
gs_free char *value = NULL;
- gint timeout;
+ int timeout;
#define SUPPLICANT_DEFAULT_TIMEOUT 25
g_return_val_if_fail (NM_IS_DEVICE (self), SUPPLICANT_DEFAULT_TIMEOUT);
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index bfca8ec186..ef7c63b8a8 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -368,8 +368,8 @@ teamd_timeout_cb (gpointer user_data)
static void
teamd_dbus_appeared (GDBusConnection *connection,
- const gchar *name,
- const gchar *name_owner,
+ const char *name,
+ const char *name_owner,
gpointer user_data)
{
NMDeviceTeam *self = NM_DEVICE_TEAM (user_data);
@@ -431,7 +431,7 @@ teamd_dbus_appeared (GDBusConnection *connection,
static void
teamd_dbus_vanished (GDBusConnection *dbus_connection,
- const gchar *name,
+ const char *name,
gpointer user_data)
{
NMDeviceTeam *self = NM_DEVICE_TEAM (user_data);
@@ -464,7 +464,7 @@ teamd_dbus_vanished (GDBusConnection *dbus_connection,
}
static void
-teamd_process_watch_cb (GPid pid, gint status, gpointer user_data)
+teamd_process_watch_cb (GPid pid, int status, gpointer user_data)
{
NMDeviceTeam *self = NM_DEVICE_TEAM (user_data);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self);
@@ -517,7 +517,7 @@ teamd_kill (NMDeviceTeam *self, const char *teamd_binary, GError **error)
g_ptr_array_add (argv, (gpointer) nm_device_get_iface (NM_DEVICE (self)));
g_ptr_array_add (argv, NULL);
- _LOGD (LOGD_TEAM, "running: %s", (tmp_str = g_strjoinv (" ", (gchar **) argv->pdata)));
+ _LOGD (LOGD_TEAM, "running: %s", (tmp_str = g_strjoinv (" ", (char **) argv->pdata)));
return g_spawn_sync ("/", (char **) argv->pdata, NULL, 0, teamd_child_setup, NULL, NULL, NULL, NULL, error);
}
@@ -605,7 +605,7 @@ teamd_start (NMDevice *device, NMConnection *connection)
g_ptr_array_add (argv, (gpointer) "-gg");
g_ptr_array_add (argv, NULL);
- _LOGD (LOGD_TEAM, "running: %s", (tmp_str = g_strjoinv (" ", (gchar **) argv->pdata)));
+ _LOGD (LOGD_TEAM, "running: %s", (tmp_str = g_strjoinv (" ", (char **) argv->pdata)));
if (!g_spawn_async ("/", (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
teamd_child_setup, NULL, &priv->teamd_pid, &error)) {
_LOGW (LOGD_TEAM, "Activation: (team) failed to start teamd: %s", error->message);
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 7667816a70..cdb688d9ae 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -204,11 +204,11 @@ remove_all_aps (NMDeviceIwd *self)
}
static GVariant *
-vardict_from_network_type (const gchar *type)
+vardict_from_network_type (const char *type)
{
GVariantBuilder builder;
- const gchar *key_mgmt = "";
- const gchar *pairwise = "ccmp";
+ const char *key_mgmt = "";
+ const char *pairwise = "ccmp";
if (!strcmp (type, "psk"))
key_mgmt = "wpa-psk";
@@ -235,7 +235,7 @@ get_ordered_networks_cb (GObject *source, GAsyncResult *res, gpointer user_data)
gs_free_error GError *error = NULL;
gs_unref_variant GVariant *variant = NULL;
GVariantIter *networks;
- const gchar *path, *name, *type;
+ const char *path, *name, *type;
int16_t signal;
NMWifiAP *ap, *ap_safe, *new_ap;
gboolean changed = FALSE;
@@ -473,7 +473,7 @@ is_connection_known_network (NMConnection *connection)
{
NMSettingWireless *s_wireless;
GBytes *ssid;
- gs_free gchar *str_ssid = NULL;
+ gs_free char *str_ssid = NULL;
s_wireless = nm_connection_get_setting_wireless (connection);
if (!s_wireless)
@@ -1005,11 +1005,11 @@ static gboolean
try_reply_agent_request (NMDeviceIwd *self,
NMConnection *connection,
GDBusMethodInvocation *invocation,
- const gchar **setting_name,
- const gchar **setting_key,
+ const char **setting_name,
+ const char **setting_key,
gboolean *replied)
{
- const gchar *method_name = g_dbus_method_invocation_get_method_name (invocation);
+ const char *method_name = g_dbus_method_invocation_get_method_name (invocation);
NMSettingWirelessSecurity *s_wireless_sec;
NMSetting8021x *s_8021x;
@@ -1019,7 +1019,7 @@ try_reply_agent_request (NMDeviceIwd *self,
*replied = FALSE;
if (!strcmp (method_name, "RequestPassphrase")) {
- const gchar *psk;
+ const char *psk;
if (!s_wireless_sec)
return FALSE;
@@ -1039,7 +1039,7 @@ try_reply_agent_request (NMDeviceIwd *self,
*setting_key = NM_SETTING_WIRELESS_SECURITY_PSK;
return TRUE;
} else if (!strcmp (method_name, "RequestPrivateKeyPassphrase")) {
- const gchar *password;
+ const char *password;
if (!s_8021x)
return FALSE;
@@ -1059,7 +1059,7 @@ try_reply_agent_request (NMDeviceIwd *self,
*setting_key = NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD;
return TRUE;
} else if (!strcmp (method_name, "RequestUserNameAndPassword")) {
- const gchar *identity, *password;
+ const char *identity, *password;
if (!s_8021x)
return FALSE;
@@ -1083,7 +1083,7 @@ try_reply_agent_request (NMDeviceIwd *self,
*setting_key = NM_SETTING_802_1X_PASSWORD;
return TRUE;
} else if (!strcmp (method_name, "RequestUserPassword")) {
- const gchar *password;
+ const char *password;
if (!s_8021x)
return FALSE;
@@ -1124,8 +1124,8 @@ wifi_secrets_cb (NMActRequest *req,
NMDeviceIwdPrivate *priv;
NMDevice *device;
GDBusMethodInvocation *invocation;
- const gchar *setting_name;
- const gchar *setting_key;
+ const char *setting_name;
+ const char *setting_key;
gboolean replied;
NMSecretAgentGetSecretsFlags get_secret_flags = NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION;
@@ -1223,12 +1223,12 @@ network_connect_cb (GObject *source, GAsyncResult *res, gpointer user_data)
NMConnection *connection;
NMSettingWireless *s_wifi;
GBytes *ssid;
- gs_free gchar *str_ssid = NULL;
+ gs_free char *str_ssid = NULL;
if (!_nm_dbus_proxy_call_finish (G_DBUS_PROXY (source), res,
G_VARIANT_TYPE ("()"),
&error)) {
- gs_free gchar *dbus_error = NULL;
+ gs_free char *dbus_error = NULL;
/* Connection failed; radio problems or if the network wasn't
* open, the passwords or certificates may be wrong.
@@ -1667,7 +1667,7 @@ set_property (GObject *object, guint prop_id,
/*****************************************************************************/
static void
-state_changed (NMDeviceIwd *self, const gchar *new_state)
+state_changed (NMDeviceIwd *self, const char *new_state)
{
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
NMDevice *device = NM_DEVICE (self);
@@ -1774,7 +1774,7 @@ properties_changed (GDBusProxy *proxy, GVariant *changed_properties,
{
NMDeviceIwd *self = user_data;
GVariantIter *iter;
- const gchar *key;
+ const char *key;
GVariant *value;
g_variant_get (changed_properties, "a{sv}", &iter);
@@ -1852,8 +1852,8 @@ nm_device_iwd_agent_query (NMDeviceIwd *self,
GDBusMethodInvocation *invocation)
{
NMActRequest *req;
- const gchar *setting_name;
- const gchar *setting_key;
+ const char *setting_name;
+ const char *setting_key;
gboolean replied;
NMSecretAgentGetSecretsFlags get_secret_flags = NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION;
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index b77cf8002e..83f8afb6de 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1880,7 +1880,7 @@ need_new_8021x_secrets (NMDeviceWifi *self,
static gboolean
need_new_wpa_psk (NMDeviceWifi *self,
NMSupplicantInterfaceState old_state,
- gint disconnect_reason,
+ int disconnect_reason,
const char **setting_name)
{
NMSettingWirelessSecurity *s_wsec;
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
index 0f95fa0801..58af7ad306 100644
--- a/src/devices/wifi/nm-iwd-manager.c
+++ b/src/devices/wifi/nm-iwd-manager.c
@@ -34,7 +34,7 @@
/*****************************************************************************/
typedef struct {
- gchar *name;
+ char *name;
NMIwdNetworkSecurity security;
} KnownNetworkData;
@@ -44,7 +44,7 @@ typedef struct {
gboolean running;
GDBusObjectManager *object_manager;
guint agent_id;
- gchar *agent_path;
+ char *agent_path;
GSList *known_networks;
} NMIwdManagerPrivate;
@@ -85,18 +85,18 @@ G_DEFINE_TYPE (NMIwdManager, nm_iwd_manager, G_TYPE_OBJECT)
static void
agent_dbus_method_cb (GDBusConnection *connection,
- const gchar *sender, const gchar *object_path,
- const gchar *interface_name, const gchar *method_name,
+ const char *sender, const char *object_path,
+ const char *interface_name, const char *method_name,
GVariant *parameters,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
NMIwdManager *self = user_data;
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
- const gchar *network_path, *device_path, *ifname;
+ const char *network_path, *device_path, *ifname;
gs_unref_object GDBusInterface *network = NULL, *device_obj = NULL;
gs_unref_variant GVariant *value = NULL;
- gint ifindex;
+ int ifindex;
NMDevice *device;
gs_free char *name_owner = NULL;
@@ -207,12 +207,12 @@ static const GDBusInterfaceInfo iwd_agent_iface_info = NM_DEFINE_GDBUS_INTERFACE
static guint
iwd_agent_export (GDBusConnection *connection, gpointer user_data,
- gchar **agent_path, GError **error)
+ char **agent_path, GError **error)
{
static const GDBusInterfaceVTable vtable = {
.method_call = agent_dbus_method_cb,
};
- gchar path[50];
+ char path[50];
unsigned int rnd;
guint id;
@@ -259,7 +259,7 @@ set_device_dbus_object (NMIwdManager *self, GDBusInterface *interface,
GDBusProxy *proxy;
GVariant *value;
const char *ifname;
- gint ifindex;
+ int ifindex;
NMDevice *device;
if (!priv->running)
@@ -380,9 +380,9 @@ list_known_networks_cb (GObject *source, GAsyncResult *res, gpointer user_data)
g_variant_get (variant, "(aa{sv})", &networks);
while (g_variant_iter_next (networks, "a{sv}", &props)) {
- const gchar *key;
- const gchar *name = NULL;
- const gchar *type = NULL;
+ const char *key;
+ const char *name = NULL;
+ const char *type = NULL;
GVariant *val;
KnownNetworkData *network_data;
@@ -594,7 +594,7 @@ prepare_object_manager (NMIwdManager *self)
}
gboolean
-nm_iwd_manager_is_known_network (NMIwdManager *self, const gchar *name,
+nm_iwd_manager_is_known_network (NMIwdManager *self, const char *name,
NMIwdNetworkSecurity security)
{
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
@@ -611,7 +611,7 @@ nm_iwd_manager_is_known_network (NMIwdManager *self, const gchar *name,
}
void
-nm_iwd_manager_network_connected (NMIwdManager *self, const gchar *name,
+nm_iwd_manager_network_connected (NMIwdManager *self, const char *name,
NMIwdNetworkSecurity security)
{
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
diff --git a/src/devices/wifi/nm-iwd-manager.h b/src/devices/wifi/nm-iwd-manager.h
index 8e6b66ff2d..6e9bff8790 100644
--- a/src/devices/wifi/nm-iwd-manager.h
+++ b/src/devices/wifi/nm-iwd-manager.h
@@ -57,9 +57,9 @@ GType nm_iwd_manager_get_type (void);
NMIwdManager *nm_iwd_manager_get (void);
-gboolean nm_iwd_manager_is_known_network (NMIwdManager *self, const gchar *name,
+gboolean nm_iwd_manager_is_known_network (NMIwdManager *self, const char *name,
NMIwdNetworkSecurity security);
-void nm_iwd_manager_network_connected (NMIwdManager *self, const gchar *name,
+void nm_iwd_manager_network_connected (NMIwdManager *self, const char *name,
NMIwdNetworkSecurity security);
#endif /* __NETWORKMANAGER_IWD_MANAGER_H__ */
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index dd6d1deb6e..d299d10234 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -1146,7 +1146,7 @@ get_property (GObject *object, guint prop_id,
case PROP_LAST_SEEN:
g_value_set_int (value,
priv->last_seen > 0
- ? (gint) nm_utils_monotonic_timestamp_as_boottime (priv->last_seen, NM_UTILS_NS_PER_SECOND)
+ ? (int) nm_utils_monotonic_timestamp_as_boottime (priv->last_seen, NM_UTILS_NS_PER_SECOND)
: -1);
break;
default:
diff --git a/src/devices/wifi/nm-wifi-utils.c b/src/devices/wifi/nm-wifi-utils.c
index 044bd392dd..2fe81e323a 100644
--- a/src/devices/wifi/nm-wifi-utils.c
+++ b/src/devices/wifi/nm-wifi-utils.c
@@ -764,7 +764,7 @@ nm_wifi_utils_complete_connection (const GByteArray *ap_ssid,
}
guint32
-nm_wifi_utils_level_to_quality (gint val)
+nm_wifi_utils_level_to_quality (int val)
{
if (val < 0) {
/* Assume dBm already; rough conversion: best = -40, worst = -100 */
diff --git a/src/devices/wifi/nm-wifi-utils.h b/src/devices/wifi/nm-wifi-utils.h
index def64dd6ff..3a982bb99b 100644
--- a/src/devices/wifi/nm-wifi-utils.h
+++ b/src/devices/wifi/nm-wifi-utils.h
@@ -37,7 +37,7 @@ gboolean nm_wifi_utils_complete_connection (const GByteArray *ssid,
gboolean lock_bssid,
GError **error);
-guint32 nm_wifi_utils_level_to_quality (gint val);
+guint32 nm_wifi_utils_level_to_quality (int val);
gboolean nm_wifi_utils_is_manf_default_ssid (const GByteArray *ssid);
diff --git a/src/devices/wifi/tests/test-general.c b/src/devices/wifi/tests/test-general.c
index 89eebb229c..a4507813d3 100644
--- a/src/devices/wifi/tests/test-general.c
+++ b/src/devices/wifi/tests/test-general.c
@@ -127,7 +127,7 @@ set_items (NMSetting *setting, const KeyData *items)
g_assert (item->str == NULL);
g_object_set (G_OBJECT (setting), item->key, item->uint, NULL);
} else if (pspec->value_type == G_TYPE_INT) {
- gint foo = (gint) item->uint;
+ int foo = (int) item->uint;
g_assert (item->str == NULL);
g_object_set (G_OBJECT (setting), item->key, foo, NULL);
@@ -1462,7 +1462,7 @@ main (int argc, char **argv)
test_ap_wpa_eap_connection_5);
#define ADD_FUNC(func) do { \
- gchar *name_idx = g_strdup_printf ("/wifi/wpa_psk/" G_STRINGIFY (func) "/%zd", i); \
+ char *name_idx = g_strdup_printf ("/wifi/wpa_psk/" G_STRINGIFY (func) "/%zd", i); \
g_test_add_data_func (name_idx, (gconstpointer) i, func); \
g_free (name_idx); \
} while (0)
@@ -1487,7 +1487,7 @@ main (int argc, char **argv)
#undef ADD_FUNC
#define ADD_FUNC(func) do { \
- gchar *name_idx = g_strdup_printf ("/wifi/rsn_psk/" G_STRINGIFY (func) "/%zd", i); \
+ char *name_idx = g_strdup_printf ("/wifi/rsn_psk/" G_STRINGIFY (func) "/%zd", i); \
g_test_add_data_func (name_idx, (gconstpointer) i, func); \
g_free (name_idx); \
} while (0)
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index e5678b9635..678c92bf7e 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -256,7 +256,7 @@ create_cdma_connect_properties (NMConnection *connection)
{
NMSettingCdma *setting;
MMSimpleConnectProperties *properties;
- const gchar *str;
+ const char *str;
setting = nm_connection_get_setting_cdma (connection);
properties = mm_simple_connect_properties_new ();
@@ -274,7 +274,7 @@ create_gsm_connect_properties (NMConnection *connection)
NMSettingGsm *setting;
NMSettingPpp *s_ppp;
MMSimpleConnectProperties *properties;
- const gchar *str;
+ const char *str;
setting = nm_connection_get_setting_gsm (connection);
properties = mm_simple_connect_properties_new ();
@@ -868,12 +868,12 @@ static_stage3_ip4_done (NMModemBroadband *self)
GError *error = NULL;
gs_unref_object NMIP4Config *config = NULL;
const char *data_port;
- const gchar *address_string;
- const gchar *gw_string;
+ const char *address_string;
+ const char *gw_string;
guint32 address_network;
guint32 gw = 0;
NMPlatformIP4Address address;
- const gchar **dns;
+ const char **dns;
guint i;
guint32 ip4_route_table, ip4_route_metric;
NMPlatformIP4Route *r;
@@ -979,10 +979,10 @@ stage3_ip6_done (NMModemBroadband *self)
GError *error = NULL;
NMIP6Config *config = NULL;
const char *data_port;
- const gchar *address_string;
+ const char *address_string;
NMPlatformIP6Address address;
NMModemIPMethod ip_method;
- const gchar **dns;
+ const char **dns;
guint i;
g_assert (self->_priv.ipv6_config);
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c
index 59cd2bca5f..dfc102f3e5 100644
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/devices/wwan/nm-modem-manager.c
@@ -170,7 +170,7 @@ modm_handle_object_added (MMManager *modem_manager,
NMModemManager *self)
{
NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
- const gchar *path;
+ const char *path;
MMModem *modem_iface;
NMModem *modem;
GError *error = NULL;
@@ -211,7 +211,7 @@ modm_handle_object_removed (MMManager *manager,
{
NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
NMModem *modem;
- const gchar *path;
+ const char *path;
path = mm_object_get_path (modem_object);
modem = (NMModem *) g_hash_table_lookup (priv->modems, path);
@@ -246,7 +246,7 @@ modm_handle_name_owner_changed (MMManager *modem_manager,
NMModemManager *self)
{
NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
- gchar *name_owner;
+ char *name_owner;
/* Quit poking, if any */
nm_clear_g_source (&priv->modm.relaunch_id);
@@ -341,7 +341,7 @@ static void
modm_manager_check_name_owner (NMModemManager *self)
{
NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
- gs_free gchar *name_owner = NULL;
+ gs_free char *name_owner = NULL;
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (priv->modm.manager));
if (name_owner) {
@@ -606,14 +606,14 @@ ofono_create_modem (NMModemManager *self, const char *path)
static void
ofono_signal_cb (GDBusProxy *proxy,
- gchar *sender_name,
- gchar *signal_name,
+ char *sender_name,
+ char *signal_name,
GVariant *parameters,
gpointer user_data)
{
NMModemManager *self = NM_MODEM_MANAGER (user_data);
NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
- gchar *object_path;
+ char *object_path;
NMModem *modem;
if (g_strcmp0 (signal_name, "ModemAdded") == 0) {
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
index 8b81ac4143..1ced1335e8 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/devices/wwan/nm-modem-ofono.c
@@ -830,8 +830,8 @@ context_property_changed (GDBusProxy *proxy,
gboolean ret = FALSE;
gs_unref_variant GVariant *v_dict = NULL;
const char *interface;
- const gchar *s;
- const gchar **array, **iter;
+ const char *s;
+ const char **array, **iter;
guint32 address_network, gateway_network;
guint32 ip4_route_table, ip4_route_metric;
int ifindex;
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 617d5c4a54..62e95cc795 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -291,7 +291,7 @@ nm_modem_get_supported_ip_types (NMModem *self)
return NM_MODEM_GET_PRIVATE (self)->ip_types;
}
-const gchar *
+const char *
nm_modem_ip_type_to_string (NMModemIPType ip_type)
{
switch (ip_type) {
diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index cad9ece415..1f05d07dae 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/devices/wwan/nm-modem.h
@@ -273,7 +273,7 @@ void nm_modem_emit_ip6_config_result (NMModem *self,
NMIP6Config *config,
GError *error);
-const gchar *nm_modem_ip_type_to_string (NMModemIPType ip_type);
+const char *nm_modem_ip_type_to_string (NMModemIPType ip_type);
guint32 nm_modem_get_configured_mtu (NMDevice *self, NMDeviceMtuSource *out_source);
View Lorry Controller Status