fix: remove the rest of the gcc warnings

15 files changed, 41 insertions, 44 deletions

diff --git a/src/ck-event-logger.c b/src/ck-event-logger.c
index 77a7092..1478707 100644
--- a/src/ck-event-logger.c
+++ b/src/ck-event-logger.c
@@ -55,8 +55,7 @@ enum {
         PROP_LOG_FILENAME
 };
 
-static void     ck_event_logger_class_init  (CkEventLoggerClass *klass);
-static void     ck_event_logger_init        (CkEventLogger      *event_logger);
+
 static void     ck_event_logger_finalize    (GObject            *object);
 
 G_DEFINE_TYPE (CkEventLogger, ck_event_logger, G_TYPE_OBJECT)
diff --git a/src/ck-file-monitor-dummy.c b/src/ck-file-monitor-dummy.c
index 27efb01..8f452b9 100644
--- a/src/ck-file-monitor-dummy.c
+++ b/src/ck-file-monitor-dummy.c
@@ -35,8 +35,7 @@ struct CkFileMonitorPrivate
         gpointer    dummy;
 };
 
-static void     ck_file_monitor_class_init  (CkFileMonitorClass *klass);
-static void     ck_file_monitor_init        (CkFileMonitor      *file_monitor);
+
 static void     ck_file_monitor_finalize    (GObject            *object);
 
 G_DEFINE_TYPE (CkFileMonitor, ck_file_monitor, G_TYPE_OBJECT)
diff --git a/src/ck-file-monitor-inotify.c b/src/ck-file-monitor-inotify.c
index b734f55..a1b4191 100644
--- a/src/ck-file-monitor-inotify.c
+++ b/src/ck-file-monitor-inotify.c
@@ -89,8 +89,7 @@ enum {
         PROP_0,
 };
 
-static void     ck_file_monitor_class_init  (CkFileMonitorClass *klass);
-static void     ck_file_monitor_init        (CkFileMonitor      *file_monitor);
+
 static void     ck_file_monitor_finalize    (GObject            *object);
 
 G_DEFINE_TYPE (CkFileMonitor, ck_file_monitor, G_TYPE_OBJECT)
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 7352df7..4ee4d2e 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -348,10 +348,10 @@ do_dump (CkManager *manager,
                 ssize_t written;
 
                 written = 0;
-                while (written < str_len) {
-                        ssize_t ret;
-                        ret = write (fd, str + written, str_len - written);
-                        if (ret < 0) {
+                while ((size_t)written < str_len) {
+                        ssize_t num_written;
+                        num_written = write (fd, str + written, str_len - written);
+                        if (num_written < 0) {
                                 if (errno == EAGAIN || errno == EINTR) {
                                         continue;
                                 } else {
@@ -359,7 +359,7 @@ do_dump (CkManager *manager,
                                         goto out;
                                 }
                         }
-                        written += ret;
+                        written += num_written;
                 }
         } else {
                 g_warning ("Couldn't construct state file: %s", error->message);
diff --git a/src/ck-seat.c b/src/ck-seat.c
index 89bb673..ef2373c 100644
--- a/src/ck-seat.c
+++ b/src/ck-seat.c
@@ -834,7 +834,7 @@ ck_seat_has_device (CkSeat      *seat,
                     gboolean    *result,
                     GError      *error)
 {
-        int i;
+        guint i;
 
         g_return_val_if_fail (CK_IS_SEAT (seat), FALSE);
 
@@ -1332,7 +1332,7 @@ ck_seat_new_with_devices (const char            *sid,
                           GDBusConnection       *connection)
 {
         GObject *object;
-        int      i;
+        guint    i;
 
         object = g_object_new (CK_TYPE_SEAT,
                                "id", sid,
@@ -1513,7 +1513,7 @@ ck_seat_run_programs (CkSeat    *seat,
 
         extra_env[n++] = NULL;
 
-        g_assert(n <= G_N_ELEMENTS(extra_env));
+        g_assert((guint)n <= G_N_ELEMENTS(extra_env));
 
         ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
         ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
@@ -1551,7 +1551,7 @@ ck_seat_dump (CkSeat   *seat,
         char    *group_name;
         GString *str;
         char    *s;
-        int      n;
+        guint    n;
 
         group_name = g_strdup_printf ("Seat %s", seat->priv->id);
 
@@ -1566,7 +1566,7 @@ ck_seat_dump (CkSeat   *seat,
         str = g_string_new (NULL);
         if (seat->priv->devices != NULL) {
                 for (n = 0; n < seat->priv->devices->len; n++) {
-                        int          m;
+                        guint        m;
                         GValueArray *va;
 
                         va = seat->priv->devices->pdata[n];
diff --git a/src/ck-session-leader.c b/src/ck-session-leader.c
index 22c1e0b..8b8b383 100644
--- a/src/ck-session-leader.c
+++ b/src/ck-session-leader.c
@@ -74,8 +74,7 @@ enum {
         PROP_0,
 };
 
-static void     ck_session_leader_class_init  (CkSessionLeaderClass *klass);
-static void     ck_session_leader_init        (CkSessionLeader      *session_leader);
+
 static void     ck_session_leader_finalize    (GObject              *object);
 
 G_DEFINE_TYPE (CkSessionLeader, ck_session_leader, G_TYPE_OBJECT)
@@ -146,7 +145,7 @@ have_override_parameter (CkSessionLeader *leader,
 static void
 lookup_parameter_type (const char *name, const char **variant_type, GType *gtype)
 {
-        int i;
+        guint i;
 
         *gtype = G_TYPE_INVALID;
 
diff --git a/src/ck-session.c b/src/ck-session.c
index 9043e2e..e2e7176 100644
--- a/src/ck-session.c
+++ b/src/ck-session.c
@@ -2080,7 +2080,7 @@ ck_session_new_with_parameters (const char      *ssid,
                                 GDBusConnection *connection)
 {
         GObject      *object;
-        gboolean      res;
+        gboolean      session_registered;
         GParameter   *params;
         guint         n_allocated_params;
         guint         n_params;
@@ -2175,8 +2175,8 @@ cleanup:
         g_free (params);
         g_type_class_unref (class);
 
-        res = register_session (CK_SESSION (object), connection);
-        if (! res) {
+        session_registered = register_session (CK_SESSION (object), connection);
+        if (! session_registered) {
                 g_object_unref (object);
                 return NULL;
         }
@@ -2189,7 +2189,7 @@ ck_session_run_programs (CkSession  *session,
                          const char *action)
 {
         ConsoleKitSession *cksession;
-        int   n;
+        guint n;
         char *extra_env[11]; /* be sure to adjust this as needed */
 
         TRACE ();
diff --git a/src/ck-sysdeps-linux.c b/src/ck-sysdeps-linux.c
index 9d7925f..bdace2e 100644
--- a/src/ck-sysdeps-linux.c
+++ b/src/ck-sysdeps-linux.c
@@ -477,7 +477,7 @@ ck_unix_pid_get_env_hash (pid_t pid)
         gsize       length;
         GError     *error;
         GHashTable *hash;
-        int         i;
+        gsize       i;
         gboolean    last_was_null;
 
         g_return_val_if_fail (pid > 1, NULL);
@@ -542,7 +542,7 @@ ck_unix_pid_get_env (pid_t       pid,
         char      *val;
         gsize      length;
         GError    *error;
-        int        i;
+        guint      i;
         char      *prefix;
         int        prefix_len;
         gboolean   last_was_null;
diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c
index 722e31b..0d2babf 100644
--- a/src/ck-sysdeps-unix.c
+++ b/src/ck-sysdeps-unix.c
@@ -49,7 +49,7 @@
 #include <sys/vt.h>
 #endif
 
-#if HAVE_SYS_CONSIO_H
+#ifdef HAVE_SYS_CONSIO_H
 #include <sys/consio.h>
 #endif
 
@@ -78,10 +78,6 @@ ck_get_socket_peer_credentials   (int      socket_fd,
         uid_t    uid_read;
         pid_t    pid_read;
 
-        pid_read = -1;
-        uid_read = -1;
-        ret = FALSE;
-
 #ifdef SO_PEERCRED
 #ifndef __OpenBSD__
         struct ucred cr;
@@ -90,6 +86,10 @@ ck_get_socket_peer_credentials   (int      socket_fd,
 #endif
         socklen_t    cr_len;
 
+        pid_read = -1;
+        uid_read = -1;
+        ret = FALSE;
+
         cr_len = sizeof (cr);
 
         if (getsockopt (socket_fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) == 0 && cr_len == sizeof (cr)) {
diff --git a/src/ck-tty-idle-monitor.c b/src/ck-tty-idle-monitor.c
index 2eea744..bc94b21 100644
--- a/src/ck-tty-idle-monitor.c
+++ b/src/ck-tty-idle-monitor.c
@@ -66,8 +66,7 @@ enum {
 
 static guint signals [LAST_SIGNAL] = { 0, };
 
-static void     ck_tty_idle_monitor_class_init  (CkTtyIdleMonitorClass *klass);
-static void     ck_tty_idle_monitor_init        (CkTtyIdleMonitor      *tty_idle_monitor);
+
 static void     ck_tty_idle_monitor_finalize    (GObject               *object);
 
 static void     schedule_tty_check              (CkTtyIdleMonitor      *monitor,
diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c
index 356df33..38c9b05 100644
--- a/src/ck-vt-monitor.c
+++ b/src/ck-vt-monitor.c
@@ -69,8 +69,7 @@ enum {
 
 static guint signals [LAST_SIGNAL] = { 0, };
 
-static void     ck_vt_monitor_class_init  (CkVtMonitorClass *klass);
-static void     ck_vt_monitor_init        (CkVtMonitor      *vt_monitor);
+
 static void     ck_vt_monitor_finalize    (GObject          *object);
 
 static void     vt_add_watches            (CkVtMonitor      *vt_monitor);
@@ -310,14 +309,16 @@ vt_thread_start (ThreadData *data)
         CkVtMonitor *vt_monitor;
         gboolean     res;
         gint32       num;
+#ifdef HAVE_SYS_VT_SIGNAL
+        /* Get our FD */
+        gint sys_fd = ck_get_vt_signal_fd ();
+#endif
 
         vt_monitor = data->vt_monitor;
         num = data->num;
 
-#ifdef HAVE_SYS_VT_SIGNAL
-        /* Get our FD */
-        gint sys_fd = ck_get_vt_signal_fd ();
 
+#ifdef HAVE_SYS_VT_SIGNAL
         while (sys_fd >= 0) {
                 res = ck_wait_for_console_switch (sys_fd, &num);
                 if (! res) {
@@ -424,8 +425,9 @@ vt_add_watches (CkVtMonitor *vt_monitor)
         ioctl (vt_monitor->priv->vfd, I_SETSIG, S_MSG);
 #elif defined (HAVE_SYS_VT_SIGNAL)
         /* We have a method to poll for vt changes, use it */
-        G_LOCK (hash_lock);
         gpointer id;
+
+        G_LOCK (hash_lock);
         id = GINT_TO_POINTER (1);
         if (g_hash_table_lookup (vt_monitor->priv->vt_thread_hash, id) == NULL)
                 vt_add_watch_unlocked (vt_monitor, 1);
diff --git a/src/main.c b/src/main.c
index 5c3b487..e4bef7c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,9 +48,9 @@ static GMainLoop *loop = NULL;
 
 
 static gboolean
-timed_exit_cb (GMainLoop *loop)
+timed_exit_cb (GMainLoop *l)
 {
-        g_main_loop_quit (loop);
+        g_main_loop_quit (l);
         return FALSE;
 }
 
@@ -200,7 +200,7 @@ create_pid_file (void)
         if ((pf = open (CONSOLE_KIT_PID_FILE, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL, 0644)) >= 0) {
                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
                 written = write (pf, pid, strlen (pid));
-                if (written != strlen(pid)) {
+                if (written < 1 || (size_t)written != strlen(pid)) {
                         g_warning ("unable to write pid file %s: %s",
                                    CONSOLE_KIT_PID_FILE,
                                    g_strerror (errno));
diff --git a/src/test-inhibit.c b/src/test-inhibit.c
index d55023d..a0364f8 100644
--- a/src/test-inhibit.c
+++ b/src/test-inhibit.c
@@ -125,7 +125,7 @@ test_unref_inhibit (void)
 }
 
 static void
-cb_changed_event (CkInhibitManager *manager, gint inhibit_mode, gint event, gboolean enabled, gpointer user_data)
+cb_changed_event (CkInhibitManager *ckmanager, gint inhibit_mode, gint event, gboolean enabled, gpointer user_data)
 {
     g_print ("cb_changed_event: mode %s event %d is now %s\n",
              inhibit_mode == CK_INHIBIT_MODE_BLOCK ? "CK_INHIBIT_MODE_BLOCK" :
diff --git a/src/test-manager.c b/src/test-manager.c
index 38f4f61..6b37060 100644
--- a/src/test-manager.c
+++ b/src/test-manager.c
@@ -304,7 +304,7 @@ out:
 }
 
 static gboolean
-validate_stuff ()
+validate_stuff (void)
 {
     gint      fd;
     GVariant *session_var = NULL, *close_var = NULL;
diff --git a/src/test-session-leader.c b/src/test-session-leader.c
index 0d90455..126561a 100644
--- a/src/test-session-leader.c
+++ b/src/test-session-leader.c
@@ -41,7 +41,7 @@
 CkSessionLeader *leader = NULL;
 
 static void
-collect_parameters_cb (CkSessionLeader       *leader,
+collect_parameters_cb (CkSessionLeader       *ckleader,
                        GVariant              *parameters,
                        GDBusMethodInvocation *context,
                        GMainLoop             *loop)