From 9f9c6d9c8546b035c0d5a5d40338aa451d6be17e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mar 12 2022 17:40:25 +0000 Subject: Fix some compiler and doxygen warnings --- diff --git a/globus-common-warn.patch b/globus-common-warn.patch new file mode 100644 index 0000000..35c63f4 --- /dev/null +++ b/globus-common-warn.patch @@ -0,0 +1,211 @@ +index c63e6fc939..ca9ff24bac 100644 +--- a/common/source/library/globus_args.c ++++ b/common/source/library/globus_args.c +@@ -91,7 +91,7 @@ globus_l_args_create_error_msg( char ** error_msg, + usage_len = strlen( oneline_usage ); + + len = strlen(p); +- strncpy( &p[len], oneline_usage, usage_len ); ++ memcpy( &p[len], oneline_usage, usage_len ); + sprintf( &p[len+usage_len], "%s", error_epilogue ); + + if (error_msg) +diff --git a/common/source/library/globus_callback.h b/common/source/library/globus_callback.h +index 1887208bbd..bb4e580772 100644 +--- a/common/source/library/globus_callback.h ++++ b/common/source/library/globus_callback.h +@@ -301,9 +301,6 @@ typedef struct globus_l_callback_space_attr_s * globus_callback_space_attr_t; + * @param user_arg + * The user argument registered with this callback + * +- * @return +- * - void +- * + * @see globus_callback_space_register_oneshot() + * @see globus_callback_space_register_periodic() + * @see globus_thread_blocking_space_will_block() +@@ -576,9 +573,6 @@ globus_callback_adjust_period( + * The callback space to poll. Note: regardless of what space is passed + * here, the 'global' space is also always polled. + * +- * @return +- * - void +- * + * @see globus_callback_spaces + * @see globus_condattr_setspace() + */ +diff --git a/common/source/library/globus_error_errno.c b/common/source/library/globus_error_errno.c +index f10b6ad8c5..90c7033842 100644 +--- a/common/source/library/globus_error_errno.c ++++ b/common/source/library/globus_error_errno.c +@@ -262,7 +262,6 @@ int + globus_error_errno_search( + globus_object_t * error) + { +- globus_module_descriptor_t * source_module; + int current_errno; + + if(error == NULL) +diff --git a/common/source/library/globus_libc.c b/common/source/library/globus_libc.c +index ecd14211cd..03327dce3b 100644 +--- a/common/source/library/globus_libc.c ++++ b/common/source/library/globus_libc.c +@@ -367,6 +367,7 @@ globus_libc_gethostname(char *name, int len) + (env = getenv("GLOBUS_HOSTNAME")) != GLOBUS_NULL) + { + strncpy(hostname, env, MAXHOSTNAMELEN); ++ hostname[MAXHOSTNAMELEN - 1] = '\0'; + hostname_length = strlen(hostname); + } + #endif +diff --git a/common/source/library/globus_options.c b/common/source/library/globus_options.c +index 914d2fbcd0..ad0053d43b 100644 +--- a/common/source/library/globus_options.c ++++ b/common/source/library/globus_options.c +@@ -114,14 +114,7 @@ globus_l_alphabetize_list( + } + else if ((!e1->short_opt) && (!e2->short_opt)) + { +- if (globus_libc_strncasecmp(e1->short_opt, e2->short_opt, strlen(e1->short_opt)) <= 0) +- { +- return GLOBUS_TRUE; +- } +- else +- { +- return GLOBUS_FALSE; +- } ++ return GLOBUS_TRUE; + } + else if (globus_libc_strncasecmp(e1->short_opt, e2->short_opt, strlen(e1->short_opt)) <= 0) + { +diff --git a/common/source/library/globus_thread.c b/common/source/library/globus_thread.c +index 0a2c58d87a..8f9765e62f 100644 +--- a/common/source/library/globus_thread.c ++++ b/common/source/library/globus_thread.c +@@ -1546,7 +1546,7 @@ globus_thread_self(void) + * @param thread2 + * Thread identifier to compare. + * @retval GLOBUS_TRUE thread1 and thread2 refer to the same thread. +- * @retval GLOBUS_TRUE thread1 and thread2 do not refer to the same thread. ++ * @retval GLOBUS_FALSE thread1 and thread2 do not refer to the same thread. + */ + globus_bool_t + globus_thread_equal( +diff --git a/common/source/test/error_test.c b/common/source/test/error_test.c +index c1ef28c18a..99a184e6ee 100644 +--- a/common/source/test/error_test.c ++++ b/common/source/test/error_test.c +@@ -118,8 +118,6 @@ main() + char *errstring; + globus_object_t *error, + *error2; +- const globus_object_type_t *type; +- int j; + + error = globus_error_get(result); + ok(error != NULL, "error_get_%d", i); +diff --git a/common/source/test/fifo_test.c b/common/source/test/fifo_test.c +index 57d5b462d4..730c7f211c 100644 +--- a/common/source/test/fifo_test.c ++++ b/common/source/test/fifo_test.c +@@ -43,12 +43,10 @@ int fifo_test(void) + globus_fifo_t currentFifo; + globus_fifo_t *newFifoPtr; + globus_fifo_t relocatedFifo; +- int rc; + int numOfItems; +- int *middleItem; ++ int *middleItem = NULL; + int middleIndex; + int *copyData; +- int errorsOccurred = 0; + + printf("1..42\n"); + numOfItems = 8; +@@ -103,7 +101,7 @@ int fifo_test(void) + /* remove an item in the middle */ + ok((data = (int *)globus_fifo_remove(¤tFifo, middleItem)) != NULL, + "remove_middle_item"); +- ok(data && (*data == *middleItem), "middle_value_check"); ++ ok(data && middleItem && (*data == *middleItem), "middle_value_check"); + + /* remove an item at the beginning */ + ok((data = globus_fifo_dequeue(¤tFifo)) != NULL, "fifo_dequeue"); +diff --git a/common/source/test/globus_args_scan_test.c b/common/source/test/globus_args_scan_test.c +index 5a8d7ae541..3775659896 100644 +--- a/common/source/test/globus_args_scan_test.c ++++ b/common/source/test/globus_args_scan_test.c +@@ -242,8 +242,6 @@ static char * testhnfail[] = { + int + main(int argc, char *argv[]) + { +- int i = 1; +- + globus_module_activate(GLOBUS_COMMON_MODULE); + + printf("1..13\n"); +diff --git a/common/source/test/memory_test.c b/common/source/test/memory_test.c +index 10e31dfa1d..e2e3ccaa44 100644 +--- a/common/source/test/memory_test.c ++++ b/common/source/test/memory_test.c +@@ -112,7 +112,6 @@ int dump(globus_byte_t * buf, int size) + int ctr; + int col = 0; + int failed=0; +- const char *p = reference_output; + + for(ctr = 0; ctr < size; ctr++) + { +diff --git a/common/source/test/module_test.c b/common/source/test/module_test.c +index 4505c71249..8ea4ac27f1 100644 +--- a/common/source/test/module_test.c ++++ b/common/source/test/module_test.c +@@ -103,7 +103,6 @@ module_test(void) + void * mod_pointer; + const char *name="GLOBUS_ENV_TEST_VAR"; + char * value1 = "value1"; +- int successful_tests=0; + + + printf("1..16\n"); +@@ -142,7 +141,7 @@ module_test(void) + * Activate a module with globus_module_activate() + */ + rc = globus_module_activate(&module1); +- ok(rc == GLOBUS_SUCCESS & ++ ok(rc == GLOBUS_SUCCESS && + active_modules[0] == 1 && + active_modules[1] == 1 && + active_modules[2] == 1, "activate_module1"); +diff --git a/common/source/test/poll_test.c b/common/source/test/poll_test.c +index e0245f0abf..1dbb8e0635 100644 +--- a/common/source/test/poll_test.c ++++ b/common/source/test/poll_test.c +@@ -188,7 +188,6 @@ adjust_period_set_infinity_callback( + int + main(int argc, char *argv[]) + { +- int tests_passed = 0; + int ctr; + + for (ctr = 0; ctr < argc; ctr++) +@@ -809,7 +808,6 @@ cancel_test() + void + verbose_printf(int level, char *s,...) + { +- char tmp[1023]; + va_list ap; + + +diff --git a/common/source/test/timedwait_test.c b/common/source/test/timedwait_test.c +index 067277cf84..a8356d5555 100644 +--- a/common/source/test/timedwait_test.c ++++ b/common/source/test/timedwait_test.c +@@ -50,7 +50,6 @@ int + timedwait_test(void) + { + int i; +- int successful_tests=0; + globus_reltime_t delay_time; + /* Test definitions: + * time when signal function should be called, diff --git a/globus-common.spec b/globus-common.spec index 1a8a654..d706f9d 100644 --- a/globus-common.spec +++ b/globus-common.spec @@ -1,13 +1,16 @@ Name: globus-common %global _name %(tr - _ <<< %{name}) Version: 18.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Grid Community Toolkit - Common Library License: ASL 2.0 URL: https://github.com/gridcf/gct/ Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz Source8: README +# Fix some compiler and doxygen warnings +# https://github.com/gridcf/gct/pull/179 +Patch0: %{name}-warn.patch BuildRequires: make BuildRequires: gcc @@ -77,6 +80,7 @@ Common Library Documentation Files %prep %setup -q -n %{_name}-%{version} +%patch0 -p3 %build # Reduce overlinking @@ -164,6 +168,9 @@ rm %{buildroot}%{_datadir}/globus-user-env.sh %license GLOBUS_LICENSE %changelog +* Sat Mar 12 2022 Mattias Ellert - 18.11-3 +- Fix some compiler and doxygen warnings + * Thu Jan 20 2022 Fedora Release Engineering - 18.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild