X-Git-Url: https://git.cworth.org/git?p=mnemon;a=blobdiff_plain;f=mnemon.c;h=a27efd4f106042f3ae14be7a626f04b7eadc2b34;hp=7b057db25a5c44c18cddd22aa07529951442dbab;hb=12dfc3592e237017c9a9afd8708728f58f8ab68a;hpb=71edc226d9b568d9740c54ea73005d8baea1ca8d

diff --git a/mnemon.c b/mnemon.c
index 7b057db..a27efd4 100644
--- a/mnemon.c
+++ b/mnemon.c
@@ -146,7 +146,7 @@ category_init (category_t *category,
 static void
 category_fini (category_t *category)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < category->num_items; i++)
 	item_fini (&category->items[i]);
@@ -191,7 +191,7 @@ category_add_item (category_t	*category,
 static item_t *
 category_next_bin_zero_item (category_t	*category)
 {
-    int *i = &category->bin_zero_head;
+    unsigned int *i = &category->bin_zero_head;
 
     for ( ; *i < category->num_items; *i = *i + 1)
 	if (category->items[*i].score == 0)
@@ -204,7 +204,7 @@ static void
 category_print (category_t	*category,
 		FILE		*file)
 {
-    int i;
+    unsigned int i;
     item_t *item;
 
     fprintf (file, "order = %s\n\n",
@@ -289,7 +289,7 @@ static int
 bin_item_index (bin_t	*bin,
 		item_t	*item)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < bin->num_items; i++)
 	if (bin->items[i] == item)
@@ -321,7 +321,7 @@ mnemon_init (mnemon_t *mnemon)
 void
 mnemon_fini (mnemon_t *mnemon)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < mnemon->num_bins; i++)
 	bin_fini (&mnemon->bins[i]);
@@ -351,7 +351,7 @@ category_t *
 mnemon_get_category_if_exists (mnemon_t	    *mnemon,
 			       const char   *name)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < mnemon->num_categories; i++)
 	if (strcmp (mnemon->categories[i].name, name) == 0)
@@ -396,7 +396,7 @@ static bin_t *
 mnemon_get_bin (mnemon_t	*mnemon,
 		int		 score)
 {
-    int i;
+    unsigned int i;
     bin_t *bin;
 
     for (i = 0; i < mnemon->num_bins; i++)
@@ -478,7 +478,7 @@ mnemon_load_category (mnemon_t		*mnemon,
     int line_count = 0;
     char *path;
     category_t *category;
-    int i;
+    unsigned int i;
     struct stat st;
 
     path = xmalloc (strlen (mnemon->dir_name) + 1 + strlen (name) + 1);
@@ -658,7 +658,8 @@ mnemon_load (mnemon_t *mnemon)
 void
 mnemon_save (mnemon_t *mnemon)
 {
-    int i, err;
+    unsigned int i;
+    int err;
     char *filename, *lock_filename;
     FILE *file;
     category_t *category;
@@ -752,12 +753,12 @@ mnemon_item_category (mnemon_t	*mnemon,
 		      item_t	*item)
 {
     category_t *category;
-    int i, item_index;
+    unsigned int i, item_index;
 
     for (i = 0; i < mnemon->num_categories; i++) {
 	category = &mnemon->categories[i];
 	item_index = item - category->items;
-	if (item_index >= 0 && item_index < category->num_items)
+	if (item_index < category->num_items)
 	    return category;
     }