diff options
| author | Eric Koegel <eric.koegel@gmail.com> | 2015-04-13 10:24:49 +0300 |
|---|---|---|
| committer | Eric Koegel <eric.koegel@gmail.com> | 2015-04-13 11:41:20 +0300 |
| commit | 176d10fb90288e64d53de9817b243d433c740036 (patch) | |
| tree | 8ccd166db8cb6ebc0eeac46a23024e3d79ae4f63 /src | |
| parent | ea62cfcd8a2621a1d5a6230e5be10e75ae737319 (diff) | |
| download | ConsoleKit2-176d10fb90288e64d53de9817b243d433c740036.tar.gz | |
Fix some cppcheck warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/ck-manager.c | 6 | ||||
| -rw-r--r-- | src/ck-seat.c | 4 | ||||
| -rw-r--r-- | src/ck-session-leader.c | 2 | ||||
| -rw-r--r-- | src/ck-sysdeps.h | 1 | ||||
| -rw-r--r-- | src/ck-vt-monitor.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/ck-manager.c b/src/ck-manager.c index 6a0877b..80523b0 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -3185,7 +3185,7 @@ dbus_get_sessions_for_unix_user (ConsoleKitManager *ckmanager, sessions = (const gchar**)g_hash_table_get_keys_as_array (manager->priv->sessions, NULL); /* gdbus/gvariant requires that we return something */ - if (sessions == NULL) { + if (sessions[0] == NULL) { sessions[0] = ""; sessions[1] = NULL; } @@ -3221,7 +3221,7 @@ dbus_get_seats (ConsoleKitManager *ckmanager, seats = (const gchar**)g_hash_table_get_keys_as_array (manager->priv->seats, NULL); /* gdbus/gvariant requires that we return something */ - if (seats == NULL) { + if (seats[0] == NULL) { seats[0] = ""; seats[1] = NULL; } @@ -3247,7 +3247,7 @@ dbus_get_sessions (ConsoleKitManager *ckmanager, sessions = (const gchar**)g_hash_table_get_keys_as_array (manager->priv->sessions, NULL); /* gdbus/gvariant requires that we return something */ - if (sessions == NULL) { + if (sessions[0] == NULL) { sessions[0] = ""; sessions[1] = NULL; } diff --git a/src/ck-seat.c b/src/ck-seat.c index 2c09ac5..f6e1c03 100644 --- a/src/ck-seat.c +++ b/src/ck-seat.c @@ -319,7 +319,7 @@ _seat_activate_session (CkSeat *seat, gchar *error_message = NULL; error_message = g_strdup_printf (_("Unable to activate session: %s"), vt_error->message); - g_debug (error_message); + g_debug ("%s", error_message); g_free (error_message); } @@ -956,7 +956,7 @@ dbus_get_sessions (ConsoleKitSeat *ckseat, sessions = (const gchar**)g_hash_table_get_keys_as_array (seat->priv->sessions, NULL); /* gdbus/gvariant requires that we return something */ - if (sessions == NULL) { + if (sessions[0] == NULL) { sessions[0] = ""; sessions[1] = NULL; } diff --git a/src/ck-session-leader.c b/src/ck-session-leader.c index d79046b..37aabd0 100644 --- a/src/ck-session-leader.c +++ b/src/ck-session-leader.c @@ -187,7 +187,7 @@ parse_output (CkSessionLeader *leader, const char *variant_type; GVariant *element; GType gtype; - gulong unix_user; + glong unix_user; gboolean is_local = FALSE; vals = g_strsplit (lines[i], " = ", 2); diff --git a/src/ck-sysdeps.h b/src/ck-sysdeps.h index 33bc5fc..bc32631 100644 --- a/src/ck-sysdeps.h +++ b/src/ck-sysdeps.h @@ -106,7 +106,6 @@ gboolean ck_wait_for_console_switch (gint sys_fd, #elif defined (G_HAVE_GNUC_VARARGS) #define TRACE(fmt, args...) G_STMT_START{ \ -{ \ g_debug ("TRACE[%s:%d] %s(): entering",__FILE__,__LINE__,__DBG_FUNC__); \ }G_STMT_END diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c index 5895c5c..356df33 100644 --- a/src/ck-vt-monitor.c +++ b/src/ck-vt-monitor.c @@ -523,7 +523,7 @@ ck_vt_monitor_finalize (GObject *object) { CkVtMonitor *vt_monitor; - TRACE ("entering"); + TRACE (); g_return_if_fail (object != NULL); g_return_if_fail (CK_IS_VT_MONITOR (object)); |