Fix up unsigned expression always true/false warnings.

diff --git a/src/filefilter.c b/src/filefilter.c
index 0d0c4a8..09a8ca0 100644 (file)
--- a/src/filefilter.c
+++ b/src/filefilter.c
@@ -304,7 +304,7 @@ void filter_rebuild(void)
                        ext = filter_to_list(fe->extensions);
                        if (ext) extension_list = g_list_concat(extension_list, ext);
 
-                       if (fe->file_class >= 0 && fe->file_class < FILE_FORMAT_CLASSES)
+                       if (fe->file_class < FILE_FORMAT_CLASSES)
                                {
                                ext = filter_to_list(fe->extensions);
                                if (ext) file_class_extension_list[fe->file_class] = g_list_concat(file_class_extension_list[fe->file_class], ext);
@@ -347,7 +347,7 @@ gint filter_file_class(const gchar *name, FileFormatClass file_class)
        GList *work;
        guint ln;
 
-       if (file_class < 0 || file_class >= FILE_FORMAT_CLASSES)
+       if (file_class >= FILE_FORMAT_CLASSES)
                {
                log_printf("WARNING: invalid file class %d\n", file_class);
                return FALSE;

diff --git a/src/image-overlay.c b/src/image-overlay.c
index 2b2f721..ec6aca8 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -1079,7 +1079,7 @@ void image_osd_icon(ImageWindow *imd, ImageOSDFlag flag, gint duration)
 
        if (!osd) return;
 
-       if (flag < IMAGE_OSD_NONE || flag >= IMAGE_OSD_COUNT) return;
+       if (flag >= IMAGE_OSD_COUNT) return;
        if (duration < 0) duration = IMAGE_OSD_DEFAULT_DURATION;
        if (duration > 1) duration += 1;
 

diff --git a/src/info.c b/src/info.c
index 1419d15..485168a 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -527,7 +527,7 @@ static void info_tab_get_order_string(gchar **dest)
                        {
                        if (t->func == info_tab_new_funcs[i])
                                {
-                               g_assert(t->pos >= 0 && t->pos < G_N_ELEMENTS(info_tab_new_funcs));
+                               g_assert(t->pos < G_N_ELEMENTS(info_tab_new_funcs));
                                str[t->pos] = i + '1';
                                }
                        }

diff --git a/src/layout.c b/src/layout.c
index 9ac112e..0302728 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1922,8 +1922,10 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, gint popped, gint hidde
 
        layout_config_parse(options->layout.style, options->layout.order,
                            &lw->dir_location,  &lw->file_location, &lw->image_location);
-       lw->dir_view_type = CLAMP(options->layout.dir_view_type, 0, VIEW_DIR_TYPES_COUNT - 1);
-       lw->file_view_type = CLAMP(options->layout.file_view_type, 0, VIEW_FILE_TYPES_COUNT - 1);
+       lw->dir_view_type = options->layout.dir_view_type;
+    if (lw->dir_view_type >= VIEW_DIR_TYPES_COUNT) lw->dir_view_type = 0;
+       lw->file_view_type = options->layout.file_view_type;
+    if (lw->file_view_type >= VIEW_FILE_TYPES_COUNT) lw->file_view_type = 0;
 
        /* divider positions */
 

diff --git a/src/print.c b/src/print.c
index e0b4663..5143150 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -332,7 +332,7 @@ static gint clip_region(gdouble x1, gdouble y1, gdouble w1, gdouble h1,
 
 static const gchar *print_output_name(PrintOutput output)
 {
-       if (output < 0 || output >= PRINT_OUTPUT_COUNT) return "";
+       if (output >= PRINT_OUTPUT_COUNT) return "";
 
        return _(print_output_text[output]);
 }
@@ -2809,7 +2809,7 @@ static void print_paper_units_set(PrintWindow *pw, PaperUnits units)
 {
        PaperUnits old_units;
 
-       if (units < 0 || units >= PAPER_UNIT_COUNT) return;
+       if (units >= PAPER_UNIT_COUNT) return;
 
        old_units = pw->paper_units;
        pw->paper_units = units;