Use a size_t to resolve a compile warning

4 files changed, 12 insertions, 11 deletions

diff --git a/src/greeter.c b/src/greeter.c
index 383e1f89..50d0defd 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -369,10 +369,10 @@ pam_messages_cb (Session *session, Greeter *greeter)
     GreeterPrivate *priv = greeter_get_instance_private (greeter);
 
     const struct pam_message *messages = session_get_messages (session);
-    int messages_length = session_get_messages_length (session);
+    size_t messages_length = session_get_messages_length (session);
 
     /* Respond to d-bus query with messages */
-    g_debug ("Prompt greeter with %d message(s)", messages_length);
+    g_debug ("Prompt greeter with %zi message(s)", messages_length);
     guint32 size = int_length () + string_length (session_get_username (session)) + int_length ();
     for (int i = 0; i < messages_length; i++)
         size += int_length () + string_length (messages[i].msg);
@@ -645,7 +645,7 @@ handle_continue_authentication (Greeter *greeter, gchar **secrets)
     if (priv->authentication_session == NULL)
         return;
 
-    int messages_length = session_get_messages_length (priv->authentication_session);
+    size_t messages_length = session_get_messages_length (priv->authentication_session);
     const struct pam_message *messages = session_get_messages (priv->authentication_session);
 
     /* Check correct number of responses */
diff --git a/src/session-child.c b/src/session-child.c
index eef51e49..112daabe 100644
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -130,7 +130,8 @@ pam_conv_cb (int msg_length, const struct pam_message **msg, struct pam_response
     write_string (username);
     gboolean auth_complete = FALSE;
     write_data (&auth_complete, sizeof (auth_complete));
-    write_data (&msg_length, sizeof (msg_length));
+    size_t length = msg_length;
+    write_data (&length, sizeof (length));
     for (int i = 0; i < msg_length; i++)
     {
         const struct pam_message *m = msg[i];
diff --git a/src/session.c b/src/session.c
index 2ea9352a..fce12a0b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -75,7 +75,7 @@ typedef struct
     gboolean is_interactive;
 
     /* Messages being requested by PAM */
-    int messages_length;
+    size_t messages_length;
     struct pam_message *messages;
 
     /* Authentication result from PAM */
@@ -544,7 +544,7 @@ from_child_cb (GIOChannel *source, GIOCondition condition, gpointer data)
             m->msg = read_string_from_child (session);
         }
 
-        l_debug (session, "Got %d message(s) from PAM", priv->messages_length);
+        l_debug (session, "Got %zi message(s) from PAM", priv->messages_length);
 
         g_signal_emit (G_OBJECT (session), signals[GOT_MESSAGES], 0);
     }
@@ -696,14 +696,14 @@ session_respond (Session *session, struct pam_response *response)
 
     int error = PAM_SUCCESS;
     write_data (session, &error, sizeof (error));
-    for (int i = 0; i < priv->messages_length; i++)
+    for (size_t i = 0; i < priv->messages_length; i++)
     {
         write_string (session, response[i].resp);
         write_data (session, &response[i].resp_retcode, sizeof (response[i].resp_retcode));
     }
 
     /* Delete the old messages */
-    for (int i = 0; i < priv->messages_length; i++)
+    for (size_t i = 0; i < priv->messages_length; i++)
         g_free ((char *) priv->messages[i].msg);
     g_free (priv->messages);
     priv->messages = NULL;
@@ -719,7 +719,7 @@ session_respond_error (Session *session, int error)
     write_data (session, &error, sizeof (error));
 }
 
-int
+size_t
 session_get_messages_length (Session *session)
 {
     SessionPrivate *priv = session_get_instance_private (session);
@@ -1007,7 +1007,7 @@ session_finalize (GObject *object)
     g_clear_pointer (&priv->username, g_free);
     g_clear_object (&priv->user);
     g_clear_pointer (&priv->pam_service, g_free);
-    for (int i = 0; i < priv->messages_length; i++)
+    for (size_t i = 0; i < priv->messages_length; i++)
         g_free ((char *) priv->messages[i].msg);
     g_clear_pointer (&priv->messages, g_free);
     g_clear_pointer (&priv->authentication_result_string, g_free);
diff --git a/src/session.h b/src/session.h
index 350cf3bb..e1130e83 100644
--- a/src/session.h
+++ b/src/session.h
@@ -126,7 +126,7 @@ void session_respond (Session *session, struct pam_response *response);
 
 void session_respond_error (Session *session, int error);
 
-int session_get_messages_length (Session *session);
+size_t session_get_messages_length (Session *session);
 
 const struct pam_message *session_get_messages (Session *session);