[glib: 3/8] Fix unecessary assert with always true assertions in gio/gresource-tool.c




commit 0214d892ba6652eb2cd6835f7e771b18f6ce042b
Author: Emmanuel Fleury <emmanuel fleury gmail com>
Date:   Wed Nov 18 20:41:48 2020 +0100

    Fix unecessary assert with always true assertions in gio/gresource-tool.c
    
    gio/gresource-tool.c: In function ‘elf_foreach_resource_section’:
    gio/gresource-tool.c:190:22: error: comparison of unsigned expression in ‘>= 0’ is always true
      190 |   g_assert (shstrndx >= 0);
          |                      ^~
    gio/gresource-tool.c:193:19: error: comparison of unsigned expression in ‘>= 0’ is always true
      193 |   g_assert (shnum >= 0);
          |                   ^~

 gio/gresource-tool.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index 1914c5228..aa718974e 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.c
@@ -180,17 +180,18 @@ elf_foreach_resource_section (Elf             *elf,
                               SectionCallback  callback,
                               gpointer         data)
 {
+  int ret;
   size_t shstrndx, shnum;
   size_t scnidx;
   Elf_Scn *scn;
   GElf_Shdr *shdr, shdr_mem;
   const gchar *section_name;
 
-  elf_getshdrstrndx (elf, &shstrndx);
-  g_assert (shstrndx >= 0);
+  ret = elf_getshdrstrndx (elf, &shstrndx);
+  g_assert (ret == 0);
 
-  elf_getshdrnum (elf, &shnum);
-  g_assert (shnum >= 0);
+  ret = elf_getshdrnum (elf, &shnum);
+  g_assert (ret == 0);
 
   for (scnidx = 1; scnidx < shnum; scnidx++)
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]