CL: Fixed some warnings shown bei clangd in CLion

ernst-bablick · ernst-bablick · commit eee3959eb244 · 2024-10-09T13:56:59.000+02:00
diff --git a/source/clients/common/ocs_client_parse.cc b/source/clients/common/ocs_client_parse.cc
@@ -39,6 +39,7 @@
 #include "uti/sge_rmon_macros.h"
 #include "uti/sge_uidgid.h"
 #include "uti/sge_unistd.h"
+#include "uti/sge_dstring.h"
 
 #include "sgeobj/parse.h"
 #include "sgeobj/sge_answer.h"
diff --git a/source/clients/common/ocs_client_parse.h b/source/clients/common/ocs_client_parse.h
@@ -33,6 +33,10 @@
  ************************************************************************/
 /*___INFO__MARK_END__*/
 
+#include "basis_types.h"
+
+#include "cull/cull.h"
+
 #define SGE_COMMON_DEF_REQ_FILE "common/sge_request"
 #define SGE_HOME_DEF_REQ_FILE ".sge_request"
 #define SGE_COMMON_DEF_QSTAT_FILE "common/sge_qstat"
diff --git a/source/clients/qdel/ocs_qdel.cc b/source/clients/qdel/ocs_qdel.cc
@@ -33,6 +33,7 @@
 /*___INFO__MARK_END__*/
 
 #include <cstring>
+#include <cstdio>
 #include <cctype>
 
 #include "uti/sge_bootstrap.h"
diff --git a/source/common/usage.h b/source/common/usage.h
@@ -33,6 +33,10 @@
  ************************************************************************/
 /*___INFO__MARK_END__*/
 
+#include <cstdlib>
+
+#include "basis_types.h"
+
 /* 
    for use in mark_argument_syntax() calls:
 
diff --git a/source/daemons/execd/ptf.h b/source/daemons/execd/ptf.h
@@ -35,6 +35,8 @@
 
 #include <sys/types.h>
 
+#include "cull/cull.h"
+
 #define PTF_COMPENSATION_FACTOR 2.0
 
 typedef pid_t osjobid_t;
diff --git a/source/daemons/execd/reaper_execd.h b/source/daemons/execd/reaper_execd.h
@@ -35,6 +35,8 @@
  ************************************************************************/
 /*___INFO__MARK_END__*/
 
+#include "cull/cull.h"
+
 #include "sgeobj/sge_daemonize.h"
 
 int sge_reap_children_execd(int max_count, bool is_qmaster_down);
diff --git a/source/daemons/qmaster/configuration_qmaster.h b/source/daemons/qmaster/configuration_qmaster.h
@@ -34,6 +34,7 @@
 /*___INFO__MARK_END__*/
 
 #include "basis_types.h"
+#include "cull/cull.h"
 #include "sgeobj/sge_daemonize.h"
 
 int
diff --git a/source/libs/cull/cull_db.cc b/source/libs/cull/cull_db.cc
@@ -1194,7 +1194,6 @@ int lString2ListNone(const char *s, lList **lpp, const lDescr *dp,
    dataType = lGetPosType(dp, pos);
    switch (dataType) {
       case lStringT:
-         DPRINTF("lString2ListNone: got lStringT data type\n");
          if (lGetNumberOfElem(*lpp) > 1 && lGetElemCaseStr(*lpp, nm, "none")) {
             lFreeList(lpp);
             return 1;
@@ -1204,7 +1203,6 @@ int lString2ListNone(const char *s, lList **lpp, const lDescr *dp,
             lFreeList(lpp);
          break;
       case lHostT:
-         DPRINTF("lString2ListNone: got lHostT data type\n");
          if (lGetNumberOfElem(*lpp) > 1 && lGetElemHost(*lpp, nm, "none")) {
             lFreeList(lpp);
             return 1;
@@ -1215,7 +1213,6 @@ int lString2ListNone(const char *s, lList **lpp, const lDescr *dp,
          break;
 
       default:
-         DPRINTF("lString2ListNone: unexpected data type\n");
          break;
    }
 
diff --git a/source/libs/cull/cull_hash.cc b/source/libs/cull/cull_hash.cc
@@ -879,6 +879,4 @@ void cull_hash_recreate_after_sort(lList *lp) {
          }
       }
    }
-
-   DRETURN_VOID;
 }
diff --git a/source/libs/cull/cull_sort.cc b/source/libs/cull/cull_sort.cc
@@ -83,9 +83,10 @@ int lInsertSorted(const lSortOrder *so, lListElem *ep, lList *lp) {
 int lResortElem(const lSortOrder *so, lListElem *ep, lList *lp) {
    lDechainElem(lp, ep);
    lInsertSorted(so, ep, lp);
-   DRETURN(0);
+   return 0;
 }
 
+#if 0
 /* ------------------------------------------------------------ 
 
    writes a sort order (for debugging purposes)
@@ -110,6 +111,7 @@ void lWriteSortOrder(
 
    DRETURN_VOID;
 }
+#endif
 
 /* ----------------------------------------
 
diff --git a/source/libs/cull/cull_sort.h b/source/libs/cull/cull_sort.h
@@ -49,8 +49,10 @@ lSortOrder *lParseSortOrder(const lDescr *dp, const char *fmt, va_list ap);
 
 void lFreeSortOrder(lSortOrder **so);
 
+#if 0
 /* for debugging purposes */
 void lWriteSortOrder(const lSortOrder *sp);
+#endif
 
 
 lSortOrder *lCreateSortOrder(int n);
diff --git a/source/libs/cull/cull_what_print.cc b/source/libs/cull/cull_what_print.cc
@@ -114,8 +114,6 @@ void lWriteWhatTo(const lEnumeration *ep, FILE *fp) {
    _lWriteWhatTo(ep, &buffer, 0);
    if (fp) {
       fprintf(fp, "%s", sge_dstring_get_string(&buffer));
-   } else {
-      DPRINTF("%s", sge_dstring_get_string(&buffer));
    }
    sge_dstring_free(&buffer);
 }
diff --git a/source/libs/sched/sge_job_schedd.h b/source/libs/sched/sge_job_schedd.h
@@ -33,6 +33,9 @@
  ************************************************************************/
 /*___INFO__MARK_END__*/
 
+#include "basis_types.h"
+#include "cull/cull.h"
+
 bool job_get_duration(u_long64 *duration, const lListElem *jep);
 bool task_get_duration(u_long64 *duration, const lListElem *ja_task);
 
diff --git a/source/libs/spool/flatfile/sge_spooling_flatfile.cc b/source/libs/spool/flatfile/sge_spooling_flatfile.cc
@@ -36,6 +36,8 @@
 #include <cerrno>
 #include <cstring>
 
+#include "cull/cull.h"
+
 #include "uti/sge_bootstrap.h"
 #include "uti/sge_dstring.h"
 #include "uti/sge_io.h"
@@ -48,7 +50,6 @@
 #include "sgeobj/sge_answer.h"
 #include "sgeobj/sge_conf.h"
 #include "sgeobj/sge_str.h"
-#include "sgeobj/sge_str.h"
 #include "sgeobj/sge_manop.h"
 #include "sgeobj/sge_job.h"
 #include "sgeobj/sge_qinstance.h"
diff --git a/source/libs/spool/loader/sge_spooling_loader.h b/source/libs/spool/loader/sge_spooling_loader.h
@@ -31,7 +31,9 @@
  *  Portions of this software are Copyright (c) 2024 HPC-Gridware GmbH
  *
  ************************************************************************/
-/*___INFO__MARK_END__*/       
+/*___INFO__MARK_END__*/
+
+#include "cull/cull.h"
 
 /* create spooling context dynamically or from compiled in default */
 lListElem *
diff --git a/source/libs/uti/sge_arch.h b/source/libs/uti/sge_arch.h
@@ -33,6 +33,8 @@
  ************************************************************************/
 /*___INFO__MARK_END__*/
 
+#include <cstdlib>
+
 const char *sge_get_arch();
 
 const char *sge_get_root_dir(int do_exit, char *buffer, size_t size, int do_error_log);
diff --git a/source/libs/uti/sge_mtutil.h b/source/libs/uti/sge_mtutil.h
@@ -33,6 +33,8 @@
  ************************************************************************/
 /*___INFO__MARK_END__*/
 
+#include <pthread.h>
+
 extern void sge_mutex_lock(const char *, const char *, int, pthread_mutex_t *);
 
 extern void sge_mutex_unlock(const char *, const char *, int, pthread_mutex_t *);
diff --git a/source/libs/uti/sge_os.h b/source/libs/uti/sge_os.h
@@ -34,6 +34,7 @@
 /*___INFO__MARK_END__*/
 
 #include <sys/time.h>
+#include <unistd.h>
 
 #include "sge_getloadavg.h"
 #include "sge_loadmem.h"
diff --git a/source/libs/uti/sge_sl.h b/source/libs/uti/sge_sl.h
@@ -35,6 +35,8 @@
 
 #include <pthread.h>
 
+#include "basis_types.h"
+
 /****** uti/sl/--SimpleList() **********************************************
 *
 *  NAME
diff --git a/test/libs/cull/test_cull_enumeration.cc b/test/libs/cull/test_cull_enumeration.cc
@@ -144,9 +144,9 @@ NAMEEND
 #define TEST1_Size sizeof(TEST1_Name) / sizeof(char *)
 
 lNameSpace nmv[] = {
-        {1,  TEST_Size,  TEST_Name},
-        {51, TEST1_Size, TEST1_Name},
-        {0, 0, nullptr}
+        {1,  TEST_Size,  TEST_Name, TEST_Type},
+        {51, TEST1_Size, TEST1_Name, TEST1_Type},
+        {0, 0, nullptr, nullptr}
 };
 
 bool test_lWhat_ALL() {
diff --git a/test/libs/cull/test_cull_hash.cc b/test/libs/cull/test_cull_hash.cc
@@ -90,8 +90,8 @@ int NM_STRING = TEST_string;
 lDescr *DESCR = TEST_Type;
 
 lNameSpace my_nmv[] = {
-        {1, TEST_Size, TEST_Name},
-        {0, 0, nullptr}
+        {1, TEST_Size, TEST_Name, TEST_Type},
+        {0, 0, nullptr, nullptr}
 };
 #endif
 
diff --git a/test/libs/cull/test_cull_list.cc b/test/libs/cull/test_cull_list.cc
@@ -88,8 +88,8 @@ NAMEEND
 #define TEST_Size sizeof(TEST_Name) / sizeof(char *)
 
 lNameSpace nmv[] = {
-        {1, TEST_Size, TEST_Name},
-        {0, 0, nullptr}
+        {1, TEST_Size, TEST_Name, TEST_Type},
+        {0, 0, nullptr, nullptr}
 };
 
 int main(int argc, char *argv[]) {
diff --git a/test/libs/cull/test_cull_pack.cc b/test/libs/cull/test_cull_pack.cc
@@ -87,8 +87,8 @@ NAMEEND
 #define TEST_Size sizeof(TEST_Name) / sizeof(char *)
 
 lNameSpace nmv[] = {
-        {1, TEST_Size, TEST_Name},
-        {0, 0, nullptr}
+        {1, TEST_Size, TEST_Name, TEST_Type},
+        {0, 0, nullptr, nullptr}
 };
 
 static bool compare_objects(const lListElem *a, const lListElem *b) {

Original file line number	Diff line number	Diff line change
`@@ -879,6 +879,4 @@ void cull_hash_recreate_after_sort(lList *lp) {`
`879`	`879`	`}`
`880`	`880`	`}`
`881`	`881`	`}`
`882`		`-`
`883`		`- DRETURN_VOID;`
`884`	`882`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,10 @@ int lInsertSorted(const lSortOrder so, lListElem ep, lList *lp) {`
`83`	`83`	`int lResortElem(const lSortOrder so, lListElem ep, lList *lp) {`
`84`	`84`	`lDechainElem(lp, ep);`
`85`	`85`	`lInsertSorted(so, ep, lp);`
`86`		`- DRETURN(0);`
	`86`	`+ return 0;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+#if 0`
`89`	`90`	`/* ------------------------------------------------------------`
`90`	`91`
`91`	`92`	`writes a sort order (for debugging purposes)`
`@@ -110,6 +111,7 @@ void lWriteSortOrder(`
`110`	`111`
`111`	`112`	`DRETURN_VOID;`
`112`	`113`	`}`
	`114`	`+#endif`
`113`	`115`
`114`	`116`	`/* ----------------------------------------`
`115`	`117`