From ffde4298435bf1e3232042c6ac7cb61ddfc1a183 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 2 Dec 2015 17:07:11 +0100 Subject: core: use G_SOURCE_REMOVE and G_SOURCE_CONTINUE in GSourceFuncs --- src/mm-base-bearer.c | 4 ++-- src/mm-base-manager.c | 2 +- src/mm-base-modem.c | 2 +- src/mm-broadband-modem-mbim.c | 2 +- src/mm-broadband-modem-qmi.c | 2 +- src/mm-broadband-modem.c | 6 +++--- src/mm-iface-modem-3gpp.c | 4 ++-- src/mm-iface-modem-cdma.c | 2 +- src/mm-iface-modem-signal.c | 2 +- src/mm-iface-modem-time.c | 2 +- src/mm-iface-modem.c | 12 ++++++------ src/mm-plugin-manager.c | 4 ++-- src/mm-port-probe.c | 26 +++++++++++++------------- src/mm-port-serial.c | 18 +++++++++--------- 14 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/mm-base-bearer.c b/src/mm-base-bearer.c index 1b1c7b31..a49ea434 100644 --- a/src/mm-base-bearer.c +++ b/src/mm-base-bearer.c @@ -200,7 +200,7 @@ deferred_3gpp_unregistration_cb (MMBaseBearer *self) mm_dbg ("Forcing bearer disconnection, not registered in 3GPP network"); mm_base_bearer_disconnect_force (self); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -282,7 +282,7 @@ deferred_cdma_unregistration_cb (MMBaseBearer *self) mm_dbg ("Forcing bearer disconnection, not registered in CDMA network"); mm_base_bearer_disconnect_force (self); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c index f11070f5..57c3ca16 100644 --- a/src/mm-base-manager.c +++ b/src/mm-base-manager.c @@ -453,7 +453,7 @@ start_device_added_idle (StartDeviceAdded *ctx) g_object_unref (ctx->self); g_object_unref (ctx->device); g_slice_free (StartDeviceAdded, ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index 84ecf8d2..3a56566c 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -1357,7 +1357,7 @@ base_modem_invalid_idle (MMBaseModem *self) * cancelled */ mm_base_modem_set_valid (self, FALSE); g_object_unref (self); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index 626d0d72..60380947 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -682,7 +682,7 @@ wait_for_sim_ready (LoadUnlockRequiredContext *ctx) (GAsyncReadyCallback)unlock_required_subscriber_ready_state_ready, ctx); mbim_message_unref (message); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 1b516c69..0dd88519 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -5495,7 +5495,7 @@ static gboolean retry_msisdn_check_cb (CdmaActivationContext *ctx) { cdma_activation_context_step (ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 85266462..32a5eea2 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -7666,7 +7666,7 @@ run_cdma_registration_checks_again (RegisterInCdmaNetworkContext *ctx) MM_IFACE_MODEM_CDMA (ctx->self), (GAsyncReadyCallback)run_cdma_registration_checks_ready, ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -8304,7 +8304,7 @@ enabling_after_modem_init_timeout (EnablingStartedContext *ctx) ctx->self->priv->enabled_ports_ctx = ports_context_ref (ctx->ports); g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); enabling_started_context_complete_and_free (ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -8506,7 +8506,7 @@ schedule_initial_registration_checks_cb (MMBroadbandModem *self) NULL); /* We got a full reference, so balance it out here */ g_object_unref (self); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c index 409c03f8..baf743fb 100644 --- a/src/mm-iface-modem-3gpp.c +++ b/src/mm-iface-modem-3gpp.c @@ -233,7 +233,7 @@ run_registration_checks_again (RegisterInNetworkContext *ctx) ctx->self, (GAsyncReadyCallback)run_registration_checks_ready, ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -1309,7 +1309,7 @@ periodic_registration_check (MMIfaceModem3gpp *self) (GAsyncReadyCallback)periodic_registration_checks_ready, NULL); } - return TRUE; + return G_SOURCE_CONTINUE; } static void diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c index 67d360a1..771bffd7 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/mm-iface-modem-cdma.c @@ -1160,7 +1160,7 @@ periodic_registration_check (MMIfaceModemCdma *self) (GAsyncReadyCallback)periodic_registration_checks_ready, NULL); } - return TRUE; + return G_SOURCE_CONTINUE; } static void diff --git a/src/mm-iface-modem-signal.c b/src/mm-iface-modem-signal.c index d28c2ad9..dbf11515 100644 --- a/src/mm-iface-modem-signal.c +++ b/src/mm-iface-modem-signal.c @@ -157,7 +157,7 @@ refresh_context_cb (MMIfaceModemSignal *self) NULL, (GAsyncReadyCallback)load_values_ready, NULL); - return TRUE; + return G_SOURCE_CONTINUE; } static void diff --git a/src/mm-iface-modem-time.c b/src/mm-iface-modem-time.c index 1a6ab213..91be855e 100644 --- a/src/mm-iface-modem-time.c +++ b/src/mm-iface-modem-time.c @@ -270,7 +270,7 @@ timezone_poll_cb (UpdateNetworkTimezoneContext *ctx) (GAsyncReadyCallback)load_network_timezone_ready, ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index 0de50e22..87dace2f 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -131,7 +131,7 @@ state_changed_wait_expired (WaitForFinalStateContext *ctx) MM_CORE_ERROR_RETRY, "Too much time waiting to get to a final state"); wait_for_final_state_context_complete_and_free (ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -250,7 +250,7 @@ load_unlock_required_again (InternalLoadUnlockRequiredContext *ctx) ctx->pin_check_timeout_id = 0; /* Retry the step */ internal_load_unlock_required_context_step (ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -961,7 +961,7 @@ periodic_access_technologies_check (MMIfaceModem *self) NULL); } - return TRUE; + return G_SOURCE_CONTINUE; } void @@ -1111,7 +1111,7 @@ expire_signal_quality (MMIfaceModem *self) /* Remove source id */ ctx = g_object_get_qdata (G_OBJECT (self), signal_quality_update_context_quark); ctx->recent_timeout_source = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -1261,7 +1261,7 @@ periodic_signal_quality_check (MMIfaceModem *self) NULL); } - return TRUE; + return G_SOURCE_CONTINUE; } static void @@ -2775,7 +2775,7 @@ restart_initialize_idle (MMIfaceModem *self) mm_base_modem_initialize (MM_BASE_MODEM (self), (GAsyncReadyCallback) reinitialize_ready, NULL); - return FALSE; + return G_SOURCE_REMOVE; } static void diff --git a/src/mm-plugin-manager.c b/src/mm-plugin-manager.c index 567555ba..734fbc12 100644 --- a/src/mm-plugin-manager.c +++ b/src/mm-plugin-manager.c @@ -334,7 +334,7 @@ deferred_support_check_idle (PortProbeContext *port_probe_ctx) { port_probe_ctx->defer_id = 0; port_probe_context_step (port_probe_ctx); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -765,7 +765,7 @@ min_wait_timeout_cb (FindDeviceSupportContext *ctx) ctx->timeout_id = g_timeout_add (MIN_PROBING_TIME_MSECS - MIN_WAIT_TIME_MSECS, (GSourceFunc)min_probing_timeout_cb, ctx); - return FALSE; + return G_SOURCE_REMOVE; } void diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 18adb38d..e58d18b7 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -563,7 +563,7 @@ wdm_probe (MMPortProbe *self) /* All done now */ port_probe_run_task_complete (task, TRUE, NULL); - return FALSE; + return G_SOURCE_REMOVE; } /***************************************************************/ @@ -659,7 +659,7 @@ serial_probe_qcdm (MMPortProbe *self) /* If already cancelled, do nothing else */ if (port_probe_run_is_cancelled (self)) - return FALSE; + return G_SOURCE_REMOVE; mm_dbg ("(%s/%s) probing QCDM...", g_udev_device_get_subsystem (self->priv->port), @@ -687,7 +687,7 @@ serial_probe_qcdm (MMPortProbe *self) "(%s/%s) Couldn't create QCDM port", g_udev_device_get_subsystem (self->priv->port), g_udev_device_get_name (self->priv->port))); - return FALSE; + return G_SOURCE_REMOVE; } /* Try to open the port */ @@ -702,7 +702,7 @@ serial_probe_qcdm (MMPortProbe *self) g_udev_device_get_name (self->priv->port), (error ? error->message : "unknown error"))); g_clear_error (&error); - return FALSE; + return G_SOURCE_REMOVE; } /* Build up the probe command; 0x7E is the frame marker, so put one at the @@ -723,7 +723,7 @@ serial_probe_qcdm (MMPortProbe *self) "(%s/%s) Failed to create QCDM versin info command", g_udev_device_get_subsystem (self->priv->port), g_udev_device_get_name (self->priv->port))); - return FALSE; + return G_SOURCE_REMOVE; } verinfo->len = len + 1; @@ -740,7 +740,7 @@ serial_probe_qcdm (MMPortProbe *self) self); g_byte_array_unref (verinfo); - return FALSE; + return G_SOURCE_REMOVE; } /***************************************************************/ @@ -955,7 +955,7 @@ serial_probe_at (MMPortProbe *self) /* If already cancelled, do nothing else */ if (port_probe_run_is_cancelled (self)) - return FALSE; + return G_SOURCE_REMOVE; /* If AT probing cancelled, end this partial probing */ if (g_cancellable_is_cancelled (task->at_probing_cancellable)) { @@ -964,7 +964,7 @@ serial_probe_at (MMPortProbe *self) g_udev_device_get_name (self->priv->port)); task->at_result_processor (self, NULL); serial_probe_schedule (self); - return FALSE; + return G_SOURCE_REMOVE; } mm_port_serial_at_command ( @@ -976,7 +976,7 @@ serial_probe_at (MMPortProbe *self) task->at_probing_cancellable, (GAsyncReadyCallback)serial_probe_at_parse_response, self); - return FALSE; + return G_SOURCE_REMOVE; } static const MMPortProbeAtCommand at_probing[] = { @@ -1162,7 +1162,7 @@ serial_open_at (MMPortProbe *self) /* If already cancelled, do nothing else */ if (port_probe_run_is_cancelled (self)) - return FALSE; + return G_SOURCE_REMOVE; /* Create AT serial port if not done before */ if (!task->serial) { @@ -1183,7 +1183,7 @@ serial_open_at (MMPortProbe *self) "(%s/%s) couldn't create AT port", g_udev_device_get_subsystem (self->priv->port), g_udev_device_get_name (self->priv->port))); - return FALSE; + return G_SOURCE_REMOVE; } g_object_set (task->serial, @@ -1236,7 +1236,7 @@ serial_open_at (MMPortProbe *self) } g_clear_error (&error); - return FALSE; + return G_SOURCE_REMOVE; } /* success, start probing */ @@ -1250,7 +1250,7 @@ serial_open_at (MMPortProbe *self) TRUE, (GAsyncReadyCallback)serial_flash_ready, self); - return FALSE; + return G_SOURCE_REMOVE; } gboolean diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c index 7dd25933..d1baa1bd 100644 --- a/src/mm-port-serial.c +++ b/src/mm-port-serial.c @@ -762,7 +762,7 @@ port_serial_timed_out (gpointer data) * serial port */ g_signal_emit (self, signals[TIMED_OUT], 0, self->priv->n_consecutive_timeouts); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -795,7 +795,7 @@ port_serial_queue_process (gpointer data) ctx = (CommandContext *) g_queue_peek_head (self->priv->queue); if (!ctx) - return FALSE; + return G_SOURCE_REMOVE; if (ctx->allow_cached) { const GByteArray *cached; @@ -814,7 +814,7 @@ port_serial_queue_process (gpointer data) g_byte_array_append (self->priv->response, cached->data, cached->len); port_serial_got_response (self, NULL); - return FALSE; + return G_SOURCE_REMOVE; } /* Cached reply wasn't found, keep on */ @@ -824,7 +824,7 @@ port_serial_queue_process (gpointer data) if (!port_serial_process_command (self, ctx, &error)) { port_serial_got_response (self, error); g_error_free (error); - return FALSE; + return G_SOURCE_REMOVE; } /* Schedule the next byte of the command to be sent */ @@ -833,7 +833,7 @@ port_serial_queue_process (gpointer data) (mm_port_get_subsys (MM_PORT (self)) == MM_PORT_SUBSYS_TTY ? self->priv->send_delay / 1000 : 0)); - return FALSE; + return G_SOURCE_REMOVE; } /* Setup the cancellable so that we can stop waiting for a response */ @@ -850,7 +850,7 @@ port_serial_queue_process (gpointer data) "Won't wait for the reply"); port_serial_got_response (self, error); g_error_free (error); - return FALSE; + return G_SOURCE_REMOVE; } } @@ -858,7 +858,7 @@ port_serial_queue_process (gpointer data) self->priv->timeout_id = g_timeout_add_seconds (ctx->timeout, port_serial_timed_out, self); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean @@ -1511,7 +1511,7 @@ reopen_do (MMPortSerial *self) g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); reopen_context_complete_and_free (ctx); - return FALSE; + return G_SOURCE_REMOVE; } void @@ -1729,7 +1729,7 @@ flash_do (MMPortSerial *self) g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); flash_context_complete_and_free (ctx); - return FALSE; + return G_SOURCE_REMOVE; } void -- cgit v1.2.3-70-g09d2