fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-13 17:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan: indentation & alignment fixes

Browse source
This commit is contained in:
Aleksander Morgado 2015-02-24 18:26:34 +01:00 • committed by Dan Williams
parent 02beeeeb12
commit 2a4b785925
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/wwan/nm-device-modem.c
View file

@ -681,7 +681,7 @@ set_modem (NMDeviceModem *self, NMModem *modem)
static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
const GValue *value, GParamSpec *pspec)
{
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object);
@ -704,7 +704,7 @@ set_property (GObject *object, guint prop_id,
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
GValue *value, GParamSpec *pspec)
{
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object);

22
src/devices/wwan/nm-modem-broadband.c
View file

@ -619,8 +619,8 @@ set_power_state_low_ready (MMModem *modem,
if (!mm_modem_set_power_state_finish (modem, result, &error)) {
/* Log but ignore errors; not all modems support low power state */
nm_log_dbg (LOGD_MB, "(%s): failed to set modem low power state: %s",
nm_modem_get_uid (NM_MODEM (self)),
error && error->message ? error->message : "(unknown)");
nm_modem_get_uid (NM_MODEM (self)),
error && error->message ? error->message : "(unknown)");
g_clear_error (&error);
}
@ -813,9 +813,9 @@ stage3_ip6_done (NMModemBroadband *self)
/* DHCP/SLAAC is allowed to skip addresses; other methods require it */
if (ip_method != NM_MODEM_IP_METHOD_AUTO) {
error = g_error_new (NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"(%s) retrieving IPv6 configuration failed: no address given",
nm_modem_get_uid (NM_MODEM (self)));
NM_DEVICE_ERROR_INVALID_CONNECTION,
"(%s) retrieving IPv6 configuration failed: no address given",
nm_modem_get_uid (NM_MODEM (self)));
}
goto out;
}
@ -844,10 +844,10 @@ stage3_ip6_done (NMModemBroadband *self)
if (address_string) {
if (!inet_pton (AF_INET6, address_string, (void *) &(address.address))) {
error = g_error_new (NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"(%s) retrieving IPv6 configuration failed: invalid gateway given '%s'",
nm_modem_get_uid (NM_MODEM (self)),
address_string);
NM_DEVICE_ERROR_INVALID_CONNECTION,
"(%s) retrieving IPv6 configuration failed: invalid gateway given '%s'",
nm_modem_get_uid (NM_MODEM (self)),
address_string);
goto out;
}
nm_log_info (LOGD_MB, " gateway %s", address_string);
@ -1156,7 +1156,7 @@ nm_modem_broadband_init (NMModemBroadband *self)
static void
set_property (GObject *object,
guint prop_id,
const GValue *value,
const GValue *value,
GParamSpec *pspec)
{
NMModemBroadband *self = NM_MODEM_BROADBAND (object);
@ -1189,7 +1189,7 @@ set_property (GObject *object,
static void
get_property (GObject *object,
guint prop_id,
GValue *value,
GValue *value,
GParamSpec *pspec)
{
NMModemBroadband *self = NM_MODEM_BROADBAND (object);

24
src/devices/wwan/nm-modem.c
View file

@ -391,9 +391,9 @@ set_data_port (NMModem *self, const char *new_data_port)
static void
ppp_ip4_config (NMPPPManager *ppp_manager,
const char *iface,
NMIP4Config *config,
gpointer user_data)
const char *iface,
NMIP4Config *config,
gpointer user_data)
{
NMModem *self = NM_MODEM (user_data);
guint32 i, num;
@ -464,9 +464,9 @@ ppp_ip6_config (NMPPPManager *ppp_manager,
static void
ppp_stats (NMPPPManager *ppp_manager,
guint32 in_bytes,
guint32 out_bytes,
gpointer user_data)
guint32 in_bytes,
guint32 out_bytes,
gpointer user_data)
{
NMModem *self = NM_MODEM (user_data);
NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
@ -513,7 +513,7 @@ ppp_stage3_ip_config_start (NMModem *self,
* use the default one (30s) */
if (priv->mm_ip_timeout > 0) {
nm_log_info (LOGD_PPP, "(%s): using modem-specified IP timeout: %u seconds",
nm_modem_get_uid (self),
nm_modem_get_uid (self),
priv->mm_ip_timeout);
ip_timeout = priv->mm_ip_timeout;
}
@ -536,7 +536,7 @@ ppp_stage3_ip_config_start (NMModem *self,
ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else {
nm_log_err (LOGD_PPP, "(%s): error starting PPP: (%d) %s",
nm_modem_get_uid (self),
nm_modem_get_uid (self),
error ? error->code : -1,
error && error->message ? error->message : "(unknown)");
g_error_free (error);
@ -1067,7 +1067,7 @@ deactivate_step (DeactivateContext *ctx)
case DEACTIVATE_CONTEXT_STEP_LAST:
nm_log_dbg (LOGD_MB, "(%s): modem deactivation finished",
nm_modem_get_uid (ctx->self));
nm_modem_get_uid (ctx->self));
deactivate_context_complete (ctx);
return;
}
@ -1250,8 +1250,8 @@ nm_modem_init (NMModem *self)
static GObject*
constructor (GType type,
guint n_construct_params,
GObjectConstructParam *construct_params)
guint n_construct_params,
GObjectConstructParam *construct_params)
{
GObject *object;
NMModemPrivate *priv;
@ -1276,7 +1276,7 @@ constructor (GType type,
return object;
err:
err:
g_object_unref (object);
return NULL;
}