[PATCH] huawei: minor coding style fixes
Aleksander Morgado
aleksander at aleksander.es
Mon May 19 03:51:22 PDT 2014
On 17/05/14 09:10, Ben Chan wrote:
> ---
> plugins/huawei/mm-broadband-bearer-huawei.c | 24 ++++++++++++------------
> plugins/huawei/mm-broadband-bearer-huawei.h | 12 ++++++------
> plugins/huawei/mm-broadband-modem-huawei.c | 2 +-
> 3 files changed, 19 insertions(+), 19 deletions(-)
>
Pushed, thanks.
> diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/plugins/huawei/mm-broadband-bearer-huawei.c
> index 2f365d8..adc62fc 100644
> --- a/plugins/huawei/mm-broadband-bearer-huawei.c
> +++ b/plugins/huawei/mm-broadband-bearer-huawei.c
> @@ -193,16 +193,16 @@ static gint
> huawei_parse_auth_type (MMBearerAllowedAuth mm_auth)
> {
> switch (mm_auth) {
> - case MM_BEARER_ALLOWED_AUTH_NONE:
> - return MM_BEARER_HUAWEI_AUTH_NONE;
> - case MM_BEARER_ALLOWED_AUTH_PAP:
> - return MM_BEARER_HUAWEI_AUTH_PAP;
> - case MM_BEARER_ALLOWED_AUTH_CHAP:
> - return MM_BEARER_HUAWEI_AUTH_CHAP;
> - case MM_BEARER_ALLOWED_AUTH_MSCHAPV2:
> - return MM_BEARER_HUAWEI_AUTH_MSCHAPV2;
> - default:
> - return MM_BEARER_HUAWEI_AUTH_UNKNOWN;
> + case MM_BEARER_ALLOWED_AUTH_NONE:
> + return MM_BEARER_HUAWEI_AUTH_NONE;
> + case MM_BEARER_ALLOWED_AUTH_PAP:
> + return MM_BEARER_HUAWEI_AUTH_PAP;
> + case MM_BEARER_ALLOWED_AUTH_CHAP:
> + return MM_BEARER_HUAWEI_AUTH_CHAP;
> + case MM_BEARER_ALLOWED_AUTH_MSCHAPV2:
> + return MM_BEARER_HUAWEI_AUTH_MSCHAPV2;
> + default:
> + 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\"",
> apn == NULL ? "" : apn);
> 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,
> user == NULL ? "" : user,
> passwd == NULL ? "" : passwd);
> @@ -786,7 +786,7 @@ static void
> mm_broadband_bearer_huawei_init (MMBroadbandBearerHuawei *self)
> {
> /* Initialize private data */
> - self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
> + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
> MM_TYPE_BROADBAND_BEARER_HUAWEI,
> MMBroadbandBearerHuaweiPrivate);
> }
> diff --git a/plugins/huawei/mm-broadband-bearer-huawei.h b/plugins/huawei/mm-broadband-bearer-huawei.h
> index 4c87d9c..4155d6b 100644
> --- a/plugins/huawei/mm-broadband-bearer-huawei.h
> +++ b/plugins/huawei/mm-broadband-bearer-huawei.h
> @@ -26,12 +26,12 @@
> #include "mm-broadband-bearer.h"
> #include "mm-broadband-modem-huawei.h"
>
> -#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_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_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_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_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_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))
>
> typedef struct _MMBroadbandBearerHuawei MMBroadbandBearerHuawei;
> typedef struct _MMBroadbandBearerHuaweiClass MMBroadbandBearerHuaweiClass;
> diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
> index fe8e600..1d63ca0 100644
> --- a/plugins/huawei/mm-broadband-modem-huawei.c
> +++ b/plugins/huawei/mm-broadband-modem-huawei.c
> @@ -3232,7 +3232,7 @@ static void
> mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self)
> {
> /* Initialize private data */
> - self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
> + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
> MM_TYPE_BROADBAND_MODEM_HUAWEI,
> MMBroadbandModemHuaweiPrivate);
> /* Prepare regular expressions to setup */
>
--
Aleksander
https://aleksander.es
More information about the ModemManager-devel
mailing list