[network-manager-applet] applet: fix coverity warnings
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] applet: fix coverity warnings
- Date: Fri, 28 Mar 2014 16:15:15 +0000 (UTC)
commit 486795125d6e8a9d8ad82bed64809d01f717e427
Author: Dan Winship <danw gnome org>
Date: Fri Mar 28 12:04:58 2014 -0400
applet: fix coverity warnings
Remove checks that an already-known-to-not-be-NULL variable isn't
NULL, so that coverity doesn't warn about later unchecked uses.
Fix a g_warn_if_fail() that might call strlen(NULL) by just using
g_warn_if_reached() instead (and then change another nearby
g_warn_if_fail() as well, for consistency).
src/applet-device-broadband.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c
index aa0275d..52ac959 100644
--- a/src/applet-device-broadband.c
+++ b/src/applet-device-broadband.c
@@ -164,7 +164,7 @@ dialog_sim_send_puk_ready (MMSim *sim,
msg = _("Wrong PUK code; please contact your provider.");
else {
g_dbus_error_strip_remote_error (error);
- msg = error ? error->message : NULL;
+ msg = error->message;
}
applet_mobile_pin_dialog_stop_spinner (info->dialog, msg);
@@ -206,7 +206,7 @@ dialog_sim_send_pin_ready (MMSim *sim,
msg = _("Wrong PIN code; please contact your provider.");
else {
g_dbus_error_strip_remote_error (error);
- msg = error ? error->message : NULL;
+ msg = error->message;
}
applet_mobile_pin_dialog_stop_spinner (info->dialog, msg);
@@ -258,8 +258,7 @@ unlock_dialog_response (GtkDialog *dialog,
code1 = applet_mobile_pin_dialog_get_entry1 (info->dialog);
if (!code1 || !strlen (code1)) {
- g_warn_if_fail (code1 != NULL);
- g_warn_if_fail (strlen (code1));
+ g_warn_if_reached ();
unlock_dialog_destroy (info);
return;
}
@@ -277,7 +276,7 @@ unlock_dialog_response (GtkDialog *dialog,
if (lock == MM_MODEM_LOCK_SIM_PUK) {
code2 = applet_mobile_pin_dialog_get_entry2 (info->dialog);
if (!code2) {
- g_warn_if_fail (code2 != NULL);
+ g_warn_if_reached ();
unlock_dialog_destroy (info);
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]