colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

huawei: minor coding style fixes

Browse Source
This commit is contained in:
Ben Chan
2014-05-17 00:10:17 -07:00
committed by Aleksander Morgado
parent adcda0a544
commit a0d15f23c9
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/huawei/mm-broadband-bearer-huawei.c
View File

@@ -193,16 +193,16 @@ static gint
huawei_parse_auth_type (MMBearerAllowedAuth mm_auth) huawei_parse_auth_type (MMBearerAllowedAuth mm_auth)
{ {
switch (mm_auth) { switch (mm_auth) {
case MM_BEARER_ALLOWED_AUTH_NONE: case MM_BEARER_ALLOWED_AUTH_NONE:
return MM_BEARER_HUAWEI_AUTH_NONE; return MM_BEARER_HUAWEI_AUTH_NONE;
case MM_BEARER_ALLOWED_AUTH_PAP: case MM_BEARER_ALLOWED_AUTH_PAP:
return MM_BEARER_HUAWEI_AUTH_PAP; return MM_BEARER_HUAWEI_AUTH_PAP;
case MM_BEARER_ALLOWED_AUTH_CHAP: case MM_BEARER_ALLOWED_AUTH_CHAP:
return MM_BEARER_HUAWEI_AUTH_CHAP; return MM_BEARER_HUAWEI_AUTH_CHAP;
case MM_BEARER_ALLOWED_AUTH_MSCHAPV2: case MM_BEARER_ALLOWED_AUTH_MSCHAPV2:
return MM_BEARER_HUAWEI_AUTH_MSCHAPV2; return MM_BEARER_HUAWEI_AUTH_MSCHAPV2;
default: default:
return MM_BEARER_HUAWEI_AUTH_UNKNOWN; return MM_BEARER_HUAWEI_AUTH_UNKNOWN;
} }
} }
@@ -293,7 +293,7 @@ connect_3gpp_context_step (Connect3gppContext *ctx)
command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\"", command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\"",
apn == NULL ? "" : apn); apn == NULL ? "" : apn);
else if (encoded_auth == MM_BEARER_HUAWEI_AUTH_NONE) else if (encoded_auth == MM_BEARER_HUAWEI_AUTH_NONE)
command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\",\"%s\",\"%s\"", command = g_strdup_printf ("AT^NDISDUP=1,1,\"%s\",\"%s\",\"%s\"",
apn == NULL ? "" : apn, apn == NULL ? "" : apn,
user == NULL ? "" : user, user == NULL ? "" : user,
passwd == NULL ? "" : passwd); passwd == NULL ? "" : passwd);
@@ -786,7 +786,7 @@ static void
mm_broadband_bearer_huawei_init (MMBroadbandBearerHuawei *self) mm_broadband_bearer_huawei_init (MMBroadbandBearerHuawei *self)
{ {
/* Initialize private data */ /* Initialize private data */
self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
MM_TYPE_BROADBAND_BEARER_HUAWEI, MM_TYPE_BROADBAND_BEARER_HUAWEI,
MMBroadbandBearerHuaweiPrivate); MMBroadbandBearerHuaweiPrivate);
} }

12
plugins/huawei/mm-broadband-bearer-huawei.h
View File

@@ -26,12 +26,12 @@
#include "mm-broadband-bearer.h" #include "mm-broadband-bearer.h"
#include "mm-broadband-modem-huawei.h" #include "mm-broadband-modem-huawei.h"
#define MM_TYPE_BROADBAND_BEARER_HUAWEI (mm_broadband_bearer_huawei_get_type ()) #define MM_TYPE_BROADBAND_BEARER_HUAWEI (mm_broadband_bearer_huawei_get_type ())
#define MM_BROADBAND_BEARER_HUAWEI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_BEARER_HUAWEI, MMBroadbandBearerHuawei)) #define MM_BROADBAND_BEARER_HUAWEI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_BEARER_HUAWEI, MMBroadbandBearerHuawei))
#define MM_BROADBAND_BEARER_HUAWEI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_BEARER_HUAWEI, MMBroadbandBearerHuaweiClass)) #define MM_BROADBAND_BEARER_HUAWEI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_BEARER_HUAWEI, MMBroadbandBearerHuaweiClass))
#define MM_IS_BROADBAND_BEARER_HUAWEI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_BEARER_HUAWEI)) #define MM_IS_BROADBAND_BEARER_HUAWEI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_BEARER_HUAWEI))
#define MM_IS_BROADBAND_BEARER_HUAWEI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_BEARER_HUAWEI)) #define MM_IS_BROADBAND_BEARER_HUAWEI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_BEARER_HUAWEI))
#define MM_BROADBAND_BEARER_HUAWEI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_BEARER_HUAWEI, MMBroadbandBearerHuaweiClass)) #define MM_BROADBAND_BEARER_HUAWEI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_BEARER_HUAWEI, MMBroadbandBearerHuaweiClass))
typedef struct _MMBroadbandBearerHuawei MMBroadbandBearerHuawei; typedef struct _MMBroadbandBearerHuawei MMBroadbandBearerHuawei;
typedef struct _MMBroadbandBearerHuaweiClass MMBroadbandBearerHuaweiClass; typedef struct _MMBroadbandBearerHuaweiClass MMBroadbandBearerHuaweiClass;

2
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -3232,7 +3232,7 @@ static void
mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self) mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self)
{ {
/* Initialize private data */ /* Initialize private data */
self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
MM_TYPE_BROADBAND_MODEM_HUAWEI, MM_TYPE_BROADBAND_MODEM_HUAWEI,
MMBroadbandModemHuaweiPrivate); MMBroadbandModemHuaweiPrivate);
/* Prepare regular expressions to setup */ /* Prepare regular expressions to setup */