Fix various compiler warnings

Problem: compiler warnings bad! Fix em.
chaos · Aug 28, 2023 · 72e6922 · 72e6922
1 parent 6bdb38b
commit 72e6922
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 19 deletions.
diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
@@ -96,12 +96,11 @@ host_triplet = @host@
 @CONVENIENCE_LTDL_TRUE@am__append_3 = libltdlc.la
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/libtool.m4 \
-	$(top_srcdir)/../m4/ltargz.m4 $(top_srcdir)/../m4/ltdl.m4 \
-	$(top_srcdir)/../m4/ltoptions.m4 \
-	$(top_srcdir)/../m4/ltsugar.m4 \
-	$(top_srcdir)/../m4/ltversion.m4 \
-	$(top_srcdir)/../m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -304,11 +303,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
 	$(top_srcdir)/../config/install-sh \
 	$(top_srcdir)/../config/ltmain.sh \
 	$(top_srcdir)/../config/missing ../config/compile \
-	../config/config.guess ../config/config.sub \
-	../config/depcomp ../config/install-sh \
-	../config/ltmain.sh \
-	../config/missing COPYING.LIB \
-	README lt__argz.c lt__dirent.c lt__strl.c
+	../config/config.guess ../config/config.sub ../config/depcomp \
+	../config/install-sh ../config/ltmain.sh ../config/missing \
+	COPYING.LIB README lt__argz.c lt__dirent.c lt__strl.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

diff --git a/src/cerebrod/cerebrod_event_server.c b/src/cerebrod/cerebrod_event_server.c
@@ -317,7 +317,7 @@ cerebrod_event_queue_monitor(void *arg)
       while ((ets = list_next(eitr)))
         {
           List_append(temp_event_queue, ets);
-          List_remove(eitr);
+          (void)List_remove(eitr);
         }
       List_iterator_destroy(eitr);
       Pthread_mutex_unlock(&event_queue_lock);

diff --git a/src/cerebrod/cerebrod_event_update.c b/src/cerebrod/cerebrod_event_update.c
@@ -497,14 +497,14 @@ cerebrod_event_modules_setup(void)
           continue;
         }
 
-      if (!(module_metric_names = event_module_metric_names(event_handle, i)) < 0)
+      if (!(module_metric_names = event_module_metric_names(event_handle, i)))
         {
           CEREBROD_DBG(("event_module_metric_names failed: %s", module_name));
           event_module_cleanup(event_handle, i);
           continue;
         }
 
-      if (!(module_event_names = event_module_event_names(event_handle, i)) < 0)
+      if (!(module_event_names = event_module_event_names(event_handle, i)))
         {
           CEREBROD_DBG(("event_module_event_names failed: %s", module_name));
           event_module_cleanup(event_handle, i);

diff --git a/src/cerebrod/cerebrod_listener.c b/src/cerebrod/cerebrod_listener.c
@@ -588,7 +588,7 @@ cerebrod_listener(void *arg)
       char nodename_buf[CEREBRO_MAX_NODENAME_LEN+1];
       char nodename_key[CEREBRO_MAX_NODENAME_LEN+1];
       struct timeval tv;
-      int in_cluster_flag, i, count;
+      int in_cluster_flag, i;
       fd_set readfds;
       int recv_len = 0;
       int maxfd = 0;
@@ -602,7 +602,7 @@ cerebrod_listener(void *arg)
           FD_SET(listener_fds[i], &readfds);
         }
 
-      count = Select(maxfd + 1, &readfds, NULL, NULL, NULL);
+      Select(maxfd + 1, &readfds, NULL, NULL, NULL);
 
       for (i = 0; i < conf.listen_message_config_len; i++)
         {

diff --git a/src/cerebrod/cerebrod_monitor_update.c b/src/cerebrod/cerebrod_monitor_update.c
@@ -224,7 +224,7 @@ cerebrod_monitor_modules_setup(void)
           continue;
         }
 
-      if (!(metric_names = monitor_module_metric_names(monitor_handle, i)) < 0)
+      if (!(metric_names = monitor_module_metric_names(monitor_handle, i)))
         {
           CEREBROD_DBG(("monitor_module_metric_names failed: %s", module_name));
           monitor_module_cleanup(monitor_handle, i);

diff --git a/src/libs/wrappers/wrappers_list.c b/src/libs/wrappers/wrappers_list.c
@@ -188,14 +188,14 @@ wrap_list_iterator_destroy(WRAPPERS_ARGS, ListIterator i)
 void *
 wrap_list_remove(WRAPPERS_ARGS, ListIterator i)
 {
-  int rv;
+  void *rv;
 
   assert(file && function);
 
   if (!i)
     WRAPPERS_ERR_INVALID_PARAMETERS("list_remove");
 
-  if (!list_remove(i))
+  if (!(rv = list_remove(i)))
     WRAPPERS_ERR_ERRNO("list_remove");
 
   return rv;