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

cinterion: minor coding style fixes

Browse Source
This commit is contained in:
Aleksander Morgado
2017-01-04 14:11:17 +01:00
parent 37521ed2b6
commit 9ca3fde06b
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cinterion/mm-broadband-bearer-cinterion.c
+9 -9
View File
@@ -689,8 +689,8 @@ disconnect_3gpp (MMBroadbandBearer *self,
/* Setup and Init Bearers */
MMBaseBearer *
mm_broadband_bearer_cinterion_new_finish (GAsyncResult *res,
GError **error)
mm_broadband_bearer_cinterion_new_finish (GAsyncResult *res,
GError **error)
{
GObject *bearer;
GObject *source;
@@ -710,10 +710,10 @@ mm_broadband_bearer_cinterion_new_finish (GAsyncResult *res,
void
mm_broadband_bearer_cinterion_new (MMBroadbandModemCinterion *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_async_initable_new_async (
MM_TYPE_BROADBAND_BEARER_CINTERION,
@@ -736,8 +736,8 @@ mm_broadband_bearer_cinterion_class_init (MMBroadbandBearerCinterionClass *klass
{
MMBroadbandBearerClass *broadband_bearer_class = MM_BROADBAND_BEARER_CLASS (klass);
broadband_bearer_class->connect_3gpp = connect_3gpp;
broadband_bearer_class->connect_3gpp_finish = connect_3gpp_finish;
broadband_bearer_class->disconnect_3gpp = disconnect_3gpp;
broadband_bearer_class->connect_3gpp = connect_3gpp;
broadband_bearer_class->connect_3gpp_finish = connect_3gpp_finish;
broadband_bearer_class->disconnect_3gpp = disconnect_3gpp;
broadband_bearer_class->disconnect_3gpp_finish = disconnect_3gpp_finish;
}
plugins/cinterion/mm-broadband-bearer-cinterion.h
+8 -9
View File
@@ -30,7 +30,7 @@
#define MM_IS_BROADBAND_BEARER_CINTERION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_BEARER_CINTERION))
#define MM_BROADBAND_BEARER_CINTERION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_BEARER_CINTERION, MMBroadbandBearerCinterionClass))
typedef struct _MMBroadbandBearerCinterion MMBroadbandBearerCinterion;
typedef struct _MMBroadbandBearerCinterion MMBroadbandBearerCinterion;
typedef struct _MMBroadbandBearerCinterionClass MMBroadbandBearerCinterionClass;
struct _MMBroadbandBearerCinterion {
@@ -43,13 +43,12 @@ struct _MMBroadbandBearerCinterionClass {
GType mm_broadband_bearer_cinterion_get_type (void);
void mm_broadband_bearer_cinterion_new (MMBroadbandModemCinterion *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseBearer *mm_broadband_bearer_cinterion_new_finish (GAsyncResult *res,
GError **error);
void mm_broadband_bearer_cinterion_new (MMBroadbandModemCinterion *modem,
MMBearerProperties *config,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseBearer *mm_broadband_bearer_cinterion_new_finish (GAsyncResult *res,
GError **error);
#endif /* MM_BROADBAND_BEARER_CINTERION_H */
plugins/cinterion/mm-broadband-modem-cinterion.c
+16 -17
View File
@@ -1694,8 +1694,7 @@ swwan_test_ready (MMBaseModem *self,
port = mm_base_modem_peek_best_data_port (self, MM_PORT_TYPE_NET);
/* SWWAN requires a net port & valid test response*/
if (mm_port_get_subsys (port) == MM_PORT_SUBSYS_NET &&
!error) {
if (mm_port_get_subsys (port) == MM_PORT_SUBSYS_NET && !error) {
mm_dbg ("SWWAN supported");
ctx->self->priv->swwan_support = FEATURE_SUPPORTED;
}
@@ -1764,8 +1763,8 @@ setup_ports (MMBroadbandModem *self)
typedef struct {
MMBroadbandModemCinterion *self;
GSimpleAsyncResult *result;
MMBearerProperties *properties;
GSimpleAsyncResult *result;
MMBearerProperties *properties;
} CreateBearerContext;
static void
@@ -1779,9 +1778,9 @@ create_bearer_context_complete_and_free (CreateBearerContext *ctx)
}
static MMBaseBearer *
cinterion_modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
cinterion_modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
MMBaseBearer *bearer;
@@ -1794,9 +1793,9 @@ cinterion_modem_create_bearer_finish (MMIfaceModem *self,
}
static void
broadband_bearer_cinterion_new_ready (GObject *source,
GAsyncResult *res,
CreateBearerContext *ctx)
broadband_bearer_cinterion_new_ready (GObject *source,
GAsyncResult *res,
CreateBearerContext *ctx)
{
MMBaseBearer *bearer;
GError *error = NULL;
@@ -1810,8 +1809,8 @@ broadband_bearer_cinterion_new_ready (GObject *source,
}
static void
broadband_bearer_new_ready (GObject *source,
GAsyncResult *res,
broadband_bearer_new_ready (GObject *source,
GAsyncResult *res,
CreateBearerContext *ctx)
{
MMBaseBearer *bearer;
@@ -1851,12 +1850,12 @@ create_bearer_for_net_port (CreateBearerContext *ctx)
}
static void
cinterion_modem_create_bearer (MMIfaceModem *self,
MMBearerProperties *properties,
GAsyncReadyCallback callback,
gpointer user_data)
cinterion_modem_create_bearer (MMIfaceModem *self,
MMBearerProperties *properties,
GAsyncReadyCallback callback,
gpointer user_data)
{
CreateBearerContext *ctx = NULL;
CreateBearerContext *ctx;
ctx = g_slice_new0 (CreateBearerContext);
ctx->self = g_object_ref (self);