7 files changed, 15 insertions, 14 deletions

diff --git a/src/cgg.c b/src/cgg.c
index 13a7389..c6ff3dc 100644
--- a/src/cgg.c
+++ b/src/cgg.c
@@ -51,7 +51,7 @@ static int jobs = 0;
 /*
  *   parse_cmd: parse commandline and fill global variable parameters
  */
-gboolean
+static gboolean
 parse_cmd (int argc, char *argv[])
 {
   static GOptionEntry entries[] =
diff --git a/src/gallery-utils.c b/src/gallery-utils.c
index 403b3c6..88a1fb3 100644
--- a/src/gallery-utils.c
+++ b/src/gallery-utils.c
@@ -138,7 +138,7 @@ copy_file (const gchar *src, const gchar *dst)
   FILE *fin;
   FILE *fout;
   void *buffer;
-  int size_r;
+  size_t size_r;
   struct stat st;
   struct utimbuf ut;
   size_t written;
@@ -361,7 +361,7 @@ remove_tags (gchar **str, const gchar *tag_begin, const gchar *tag_end)
 int
 count_dir_levels (const gchar *path)
 {
-  int i;
+  guint i;
   int level;
 
   if (path == NULL || strlen (path) == 0)
diff --git a/src/generators.c b/src/generators.c
index 5ab5765..6c65227 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -93,7 +93,7 @@ get_root_level (TAlbum *items)
 static int
 get_item_index (TAlbum *items, TIndexItem *item)
 {
-  int i;
+  guint i;
 
   for (i = 0; i < items->items->len; i++)
     if (g_ptr_array_index (items->items, i) == item)
@@ -106,7 +106,7 @@ get_display_item_index (TAlbum *items, TIndexItem *item)
 {
   TIndexItem *tmp_item;
   int real_item_index = 0;
-  int i;
+  guint i;
 
   for (i = 0; i < items->items->len; i++) {
     tmp_item = g_ptr_array_index (items->items, i);
@@ -124,7 +124,7 @@ get_display_item_count (TAlbum *items)
 {
   TIndexItem *tmp_item;
   int real_total_items = 0;
-  int i;
+  guint i;
 
   for (i = 0; i < items->items->len; i++) {
     tmp_item = g_ptr_array_index (items->items, i);
@@ -412,7 +412,7 @@ have_album_image_size_cb (gchar **args, gpointer user_data)
   struct HaveImageSizeData *data = user_data;
   TImageSize *image_size;
   TIndexItem *iter_item;
-  int i;
+  guint i;
 
   g_return_val_if_fail (g_strv_length (args) != 2, FALSE);  /* incl. trailing NULL */
 
@@ -821,7 +821,7 @@ add_next_prev_links (TGallerySetup *setup,
   TIndexItem *next_item = NULL;
   TIndexItem *tmp_item;
   int item_index;
-  int i;
+  guint i;
   gchar *s;
 
   item_index = get_item_index (items, item);
@@ -1147,7 +1147,7 @@ write_html_page (TGallerySetup *setup,
   int level;
   gboolean res;
   int bb;
-  int i;
+  guint i;
   ReplaceTable *global_replace_table;
   ReplaceTable *local_replace_table;
   BlockParser *block_parser;
diff --git a/src/job-manager.c b/src/job-manager.c
index 9dcb3cd..ec79449 100644
--- a/src/job-manager.c
+++ b/src/job-manager.c
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "job-manager.h"
 #include "setup.h"
 #include "items.h"
 #include "gallery-utils.h"
@@ -189,13 +190,13 @@ build_tree (TGallerySetup *setup,
             TPathInfo *path_info,
             TAlbum *parent_index,
             int parent_item_index,
-            int jobs)
+            guint jobs)
 {
   gchar *idx_file;
   TAlbum *items;
   TIndexItem *item;
   gchar *s1, *s2, *s3, *s4;
-  int i;
+  guint i;
   TJob *job;
   GError *error;
   GThread *thread;
diff --git a/src/job-manager.h b/src/job-manager.h
index 58a0cb3..0cb58b9 100644
--- a/src/job-manager.h
+++ b/src/job-manager.h
@@ -38,7 +38,7 @@ gboolean build_tree (TGallerySetup *setup,
                      TPathInfo *path_info,
                      TAlbum *parent_index,
                      int parent_item_index,
-                     int jobs);
+                     guint jobs);
 
 
 G_END_DECLS
diff --git a/src/replace-table.c b/src/replace-table.c
index a36a83c..eb6ca3f 100644
--- a/src/replace-table.c
+++ b/src/replace-table.c
@@ -169,7 +169,7 @@ parse_function_args (const char *str, GPtrArray *a)
 {
   gboolean in_quotes;
   gboolean in_apos;
-  int i;
+  guint i;
   const char *str_start;
 
   in_quotes = FALSE;
diff --git a/src/setup.c b/src/setup.c
index 9dedd77..266c36e 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -429,7 +429,7 @@ makeup_legacy_design (const gchar *filename)
   TImageSize *image_size;
   TGalleryDesignTheme *theme;
   gboolean squared_thumbs;
-  int i;
+  guint i;
   const gchar * image_sizes[3] = { "thumbnail", "preview", "original" };
 
   xml = xml_parser_load (filename);