public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mattias Ellert <mattias.ellert@physics.uu.se>
To: git-commits@fedoraproject.org
Subject: [rpms/globus-gram-job-manager] rawhide: Fix compiler warnings
Date: Sun, 14 Jun 2026 08:47:27 GMT [thread overview]
Message-ID: <178142684738.1.4826885703607525369.rpms-globus-gram-job-manager-27bae8287e35@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/globus-gram-job-manager
Branch : rawhide
Commit : 27bae8287e35b718d85ac9ff3c50d8b1fa1ebf62
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +984/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/globus-gram-job-manager/c/27bae8287e35b718d85ac9ff3c50d8b1fa1ebf62?branch=rawhide
Log:
Fix compiler warnings
---
diff --git a/0001-Untabify-and-remove-trailing-white-space.patch b/0001-Untabify-and-remove-trailing-white-space.patch
new file mode 100644
index 0000000..b8db0ae
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,604 @@
+From 3ccdaa0236230bbcbcbf339e7dfdfaf23c10bd6f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 May 2026 00:15:37 +0200
+Subject: [PATCH 1/2] Untabify and remove trailing white-space
+
+---
+ .../source/globus_gram_job_manager.c | 62 ++++++-------
+ .../source/globus_gram_job_manager_query.c | 10 +--
+ .../source/globus_gram_job_manager_script.c | 86 +++++++++----------
+ gram/jobmanager/source/logging.c | 6 +-
+ 4 files changed, 82 insertions(+), 82 deletions(-)
+
+diff --git a/gram/jobmanager/source/globus_gram_job_manager.c b/gram/jobmanager/source/globus_gram_job_manager.c
+index b617fe253..fd30ad534 100644
+--- a/gram/jobmanager/source/globus_gram_job_manager.c
++++ b/gram/jobmanager/source/globus_gram_job_manager.c
+@@ -364,8 +364,8 @@ globus_gram_job_manager_init(
+ rc = GLOBUS_GRAM_PROTOCOL_ERROR_MALLOC_FAILED;
+ goto event_queue_init_failed;
+ }
+- manager->usagetracker =
+- calloc(1, sizeof(globus_i_gram_usage_tracker_t));
++ manager->usagetracker =
++ calloc(1, sizeof(globus_i_gram_usage_tracker_t));
+ if (manager->usagetracker == NULL)
+ {
+ rc = GLOBUS_GRAM_PROTOCOL_ERROR_MALLOC_FAILED;
+@@ -408,7 +408,7 @@ request_hashtable_init_failed:
+ globus_gram_job_manager_validation_destroy(
+ manager->validation_records);
+ manager->validation_records = NULL;
+-
++
+ globus_cond_destroy(&manager->cond);
+ cond_init_failed:
+ GlobusGramJobManagerUnlock(manager);
+@@ -424,10 +424,10 @@ out:
+
+ /**
+ * Destroy job manager state
+- *
++ *
+ * Memory used for runtime processing is freed, the GRAM listener and the SEG
+ * are shut down.
+- *
++ *
+ * @param manager
+ * Manager to destroy
+ */
+@@ -449,7 +449,7 @@ globus_gram_job_manager_destroy(
+ globus_gram_job_manager_validation_destroy(
+ manager->validation_records);
+ manager->validation_records = NULL;
+-
++
+ globus_hashtable_destroy(&manager->request_hash);
+ globus_hashtable_destroy(&manager->job_id_hash);
+
+@@ -458,7 +458,7 @@ globus_gram_job_manager_destroy(
+ while (!globus_list_empty(manager->scripts_per_client))
+ {
+ globus_gram_job_manager_scripts_t *scripts;
+-
++
+ scripts = globus_list_remove(
+ &manager->scripts_per_client,
+ manager->scripts_per_client);
+@@ -468,12 +468,12 @@ globus_gram_job_manager_destroy(
+ free(scripts->client_addr);
+ free(scripts);
+ }
+-
++
+ if(manager->usagetracker)
+ {
+ free(manager->usagetracker);
+ }
+-
++
+ return;
+ }
+ /* globus_gram_job_manager_destroy() */
+@@ -513,7 +513,7 @@ globus_gram_job_manager_log(
+ va_end(ap);
+ logged = GLOBUS_TRUE;
+ }
+-
++
+ if ((!logged) && (manager && !manager->done))
+ {
+ /* Hack to write to stderr in the case the error happens before we
+@@ -615,10 +615,10 @@ globus_gram_job_manager_add_request(
+ {
+ manager->usagetracker->count_current_jobs++;
+
+- if(manager->usagetracker->count_peak_jobs <
++ if(manager->usagetracker->count_peak_jobs <
+ manager->usagetracker->count_current_jobs)
+ {
+- manager->usagetracker->count_peak_jobs =
++ manager->usagetracker->count_peak_jobs =
+ manager->usagetracker->count_current_jobs;
+ }
+ }
+@@ -726,7 +726,7 @@ stop:
+ * Pointer to the reference counter structure that is allocated by
+ * this function.
+ *
+- *
++ *
+ * @retval GLOBUS_SUCCESS
+ * Success
+ * @retval GLOBUS_GRAM_PROTOCOL_ERROR_OLD_JM_ALIVE
+@@ -1148,10 +1148,10 @@ globus_l_gram_job_manager_remove_reference_locked(
+ request->manager->seg_started &&
+ request->jobmanager_state !=
+ GLOBUS_GRAM_JOB_MANAGER_STATE_STOP) ||
+- (request->jobmanager_state ==
++ (request->jobmanager_state ==
+ GLOBUS_GRAM_JOB_MANAGER_STATE_STOP &&
+ (manager->stop == GLOBUS_TRUE ||
+- manager->seg_started == GLOBUS_FALSE ||
++ manager->seg_started == GLOBUS_FALSE ||
+ request->restart_state == GLOBUS_GRAM_JOB_MANAGER_STATE_TWO_PHASE_END ||
+ request->restart_state == GLOBUS_GRAM_JOB_MANAGER_STATE_FAILED_TWO_PHASE)))
+ {
+@@ -1263,7 +1263,7 @@ globus_gram_job_manager_register_job_id(
+ request->job_contact_path,
+ job_id);
+
+- if (manager->config->seg_module != NULL ||
++ if (manager->config->seg_module != NULL ||
+ strcmp(manager->config->jobmanager_type, "condor") == 0)
+ {
+ /* If we're using the SEG, split on /,/ so that seg events can be
+@@ -1959,7 +1959,7 @@ globus_gram_job_manager_set_grace_period_timer(
+ /**
+ * Fake a two-phase commit for jobs that are in a done state, but are older
+ * than their expiration time.
+- *
++ *
+ * @param arg
+ * Pointer to the job manager structure for this job.
+ * @return void
+@@ -2033,11 +2033,11 @@ globus_gram_job_manager_expire_old_jobs(
+ goto oneshot_failed;
+ }
+ }
+-
++
+ expired++;
+ }
+ oneshot_failed:
+- rc = globus_l_gram_job_manager_remove_reference_locked(
++ rc = globus_l_gram_job_manager_remove_reference_locked(
+ manager,
+ ref->key,
+ "expire");
+@@ -2202,10 +2202,10 @@ globus_gram_job_manager_stop_all_jobs(
+ * Scan the job state directory for jobs to restart
+ *
+ * The globus_gram_job_manager_request_load_all() function scans the
+- * job state directory named in the job manager configuration and then
+- * attempts to reload each job found in that directory. If the job is in
++ * job state directory named in the job manager configuration and then
++ * attempts to reload each job found in that directory. If the job is in
+ * a state where it will be immediately swapped out (waiting for SEG events)
+- * then the job is registered for processing
++ * then the job is registered for processing
+ *
+ * @param manager
+ * Job Manager
+@@ -2268,7 +2268,7 @@ globus_gram_job_manager_request_load_all(
+ rc = GLOBUS_GRAM_PROTOCOL_ERROR_MALLOC_FAILED;
+ goto state_file_pattern_alloc_failed;
+ }
+-
++
+ hashed_job_dir = globus_common_create_string(
+ "%s/%s/%s/%s",
+ manager->config->job_state_file_dir,
+@@ -2531,7 +2531,7 @@ globus_l_gram_job_manager_request_load_all_from_dir(
+ /* Optimize the (hopefully) common case. The job is pending
+ * or active in the queue and we will want to wait for
+ * job state changes. In this case, we add the reference to
+- * the job's LRM job id
++ * the job's LRM job id
+ */
+ if ((request->config->seg_module != NULL ||
+ strcmp(request->config->jobmanager_type, "fork") == 0 ||
+@@ -2574,7 +2574,7 @@ globus_l_gram_job_manager_request_load_all_from_dir(
+ }
+ /* Add a stub in the job manager's request_hash for this job. The
+ * Reference count will be left at 0, and we will null out the
+- * ref->request pointer below. This allows queries, SEG events, and
++ * ref->request pointer below. This allows queries, SEG events, and
+ * the restart code to look up the job ID without the entire
+ * request remaining in memory.
+ */
+@@ -2979,16 +2979,16 @@ globus_l_gram_add_reference_locked(
+ ref->request->restart_state ==
+ GLOBUS_GRAM_JOB_MANAGER_STATE_POLL_QUERY1 ||
+ ref->request->restart_state ==
+- GLOBUS_GRAM_JOB_MANAGER_STATE_POLL_QUERY2)
++ GLOBUS_GRAM_JOB_MANAGER_STATE_POLL_QUERY2)
+ {
+- ref->request->jobmanager_state = GLOBUS_GRAM_JOB_MANAGER_STATE_POLL2;
+- }
++ ref->request->jobmanager_state = GLOBUS_GRAM_JOB_MANAGER_STATE_POLL2;
++ }
+ else if (!ref->loaded_only)
+ {
+ ref->request->jobmanager_state = ref->request->restart_state;
+- }
++ }
+ ref->loaded_only = GLOBUS_FALSE;
+-
++
+ ref->request->job_stats.status_count += ref->status_count;
+ ref->status_count = 0;
+ }
+@@ -3263,7 +3263,7 @@ skip_path_lookup:
+ pipe_cmd[3] = "-c";
+ pipe_cmd[4] = "interactive";
+ pipe_cmd[5] = "-l";
+- result = globus_eval_path(
++ result = globus_eval_path(
+ "${libdir}",
+ &pipe_cmd[6]);
+ if (result != GLOBUS_SUCCESS || pipe_cmd[6] == NULL)
+diff --git a/gram/jobmanager/source/globus_gram_job_manager_query.c b/gram/jobmanager/source/globus_gram_job_manager_query.c
+index 290133116..eab9611fc 100644
+--- a/gram/jobmanager/source/globus_gram_job_manager_query.c
++++ b/gram/jobmanager/source/globus_gram_job_manager_query.c
+@@ -584,15 +584,15 @@ globus_l_gram_job_manager_cancel(
+ case GLOBUS_GRAM_JOB_MANAGER_STATE_POLL_QUERY1:
+ case GLOBUS_GRAM_JOB_MANAGER_STATE_POLL_QUERY2:
+ query = calloc(1, sizeof(globus_gram_job_manager_query_t));
+-
++
+ query->type = GLOBUS_GRAM_JOB_MANAGER_CANCEL;
+ query->handle = handle;
+ query->signal = 0;
+ query->signal_arg = NULL;
+-
++
+ globus_fifo_enqueue(&request->pending_queries, query);
+ *reply = GLOBUS_FALSE;
+-
++
+ if(request->jobmanager_state == GLOBUS_GRAM_JOB_MANAGER_STATE_POLL2)
+ {
+ request->jobmanager_state =
+@@ -764,7 +764,7 @@ globus_l_gram_job_manager_renew(
+ -rc,
+ msg,
+ globus_gram_protocol_error_string(rc));
+-
++
+ globus_gram_job_manager_remove_reference(
+ request->manager,
+ request->job_contact_path,
+@@ -1026,7 +1026,7 @@ globus_l_gram_job_manager_signal(
+ }
+ else if(request->jobmanager_state ==
+ GLOBUS_GRAM_JOB_MANAGER_STATE_TWO_PHASE ||
+- request->jobmanager_state ==
++ request->jobmanager_state ==
+ GLOBUS_GRAM_JOB_MANAGER_STATE_START)
+ {
+ request->jobmanager_state =
+diff --git a/gram/jobmanager/source/globus_gram_job_manager_script.c b/gram/jobmanager/source/globus_gram_job_manager_script.c
+index 2cf311926..907957c15 100644
+--- a/gram/jobmanager/source/globus_gram_job_manager_script.c
++++ b/gram/jobmanager/source/globus_gram_job_manager_script.c
+@@ -95,11 +95,11 @@ globus_gram_job_manager_script_context_t;
+ static
+ void
+ globus_l_gram_job_manager_script_read(
+- globus_xio_handle_t handle,
++ globus_xio_handle_t handle,
+ globus_result_t result,
+ globus_byte_t * buffer,
+ globus_size_t len,
+- globus_size_t nbytes,
++ globus_size_t nbytes,
+ globus_xio_data_descriptor_t data_desc,
+ void * user_arg);
+
+@@ -197,7 +197,7 @@ globus_l_gram_script_open_callback(
+ static
+ int
+ globus_l_gram_script_register_read_and_write(
+- globus_gram_job_manager_script_context_t *
++ globus_gram_job_manager_script_context_t *
+ script_context);
+
+ static
+@@ -353,11 +353,11 @@ fifo_init_failed:
+ static
+ void
+ globus_l_gram_job_manager_script_read(
+- globus_xio_handle_t handle,
++ globus_xio_handle_t handle,
+ globus_result_t result,
+ globus_byte_t * buffer,
+ globus_size_t len,
+- globus_size_t nbytes,
++ globus_size_t nbytes,
+ globus_xio_data_descriptor_t data_desc,
+ void * user_arg)
+ {
+@@ -563,18 +563,18 @@ globus_l_gram_job_manager_script_read(
+ if (sizeof(script_handle->return_buf) >
+ script_handle->return_buf_offset)
+ {
+- globus_gram_job_manager_request_log(
+- script_context->request,
+- GLOBUS_GRAM_JOB_MANAGER_LOG_TRACE,
+- "event=gram.script_read.info "
+- "level=TRACE "
+- "message=\"registering read\" "
+- "return_buf_offset=%d "
+- "read_len=%d "
+- "\n",
+- (int) script_handle->return_buf_offset,
+- (int) (sizeof(script_handle->return_buf) - script_handle->return_buf_offset),
+- p);
++ globus_gram_job_manager_request_log(
++ script_context->request,
++ GLOBUS_GRAM_JOB_MANAGER_LOG_TRACE,
++ "event=gram.script_read.info "
++ "level=TRACE "
++ "message=\"registering read\" "
++ "return_buf_offset=%d "
++ "read_len=%d "
++ "\n",
++ (int) script_handle->return_buf_offset,
++ (int) (sizeof(script_handle->return_buf) - script_handle->return_buf_offset),
++ p);
+ result = globus_xio_register_read(
+ script_handle->handle,
+ &script_handle->return_buf[script_handle->return_buf_offset],
+@@ -638,7 +638,7 @@ globus_l_gram_job_manager_script_read(
+ globus_list_search_pred(
+ request->manager->scripts_per_client,
+ globus_l_match_script_client_addr,
+- request->job_stats.client_address
++ request->job_stats.client_address
+ ? request->job_stats.client_address
+ : (void *) GLOBUS_GRAM_SCRIPT_NO_CLIENT));
+
+@@ -686,7 +686,7 @@ globus_l_gram_job_manager_script_read(
+ * Submit a job request to a local scheduler.
+ *
+ * This function submits the passed job request to the local scheduler
+- * script.
++ * script.
+ *
+ * @param request
+ * The request containing the job description and related information.
+@@ -815,7 +815,7 @@ static void job_contact_strip_port(
+ * Try to poll status of job request using Condor grid_manager_monitor_agent
+ *
+ * If the Condor grid_manager_monitor_agent is running on the machine, this
+- * function retrieve job request status using that, otherwise it fails.
++ * function retrieve job request status using that, otherwise it fails.
+ * Expected to be called exclusively from globus_gram_job_manager_script_poll.
+ */
+ int
+@@ -1024,7 +1024,7 @@ FAST_POLL_EXIT_FAILURE:
+ return_val = GLOBUS_FAILURE;
+
+ FAST_POLL_EXIT:
+- if(grid_monitor_file)
++ if(grid_monitor_file)
+ fclose(grid_monitor_file);
+ for ( i = 0; grid_monitor_files[i]; i++ ) {
+ free(grid_monitor_files[i]);
+@@ -1050,7 +1050,7 @@ FAST_POLL_EXIT:
+ * is the same as the result from the value of request's status field. This
+ * field will be updated if the job's status has changed.
+ */
+-int
++int
+ globus_gram_job_manager_script_poll(
+ globus_gram_jobmanager_request_t * request)
+ {
+@@ -1066,7 +1066,7 @@ globus_gram_job_manager_script_poll(
+ /* Keep the state file's timestamp up to date so that
+ * anything scrubbing the state files of old and dead
+ * processes leaves it alone
+- */
++ */
+ if(request->job_state_file)
+ {
+ utime(request->job_state_file, NULL);
+@@ -1176,7 +1176,7 @@ globus_gram_job_manager_script_signal(
+ }
+ /* globus_gram_job_manager_script_signal() */
+
+-int
++int
+ globus_gram_job_manager_script_stage_in(
+ globus_gram_jobmanager_request_t * request)
+ {
+@@ -1205,7 +1205,7 @@ globus_gram_job_manager_script_stage_in(
+ }
+ /* globus_gram_job_manager_script_stage_in() */
+
+-int
++int
+ globus_gram_job_manager_script_stage_out(
+ globus_gram_jobmanager_request_t * request)
+ {
+@@ -1269,7 +1269,7 @@ globus_l_gram_job_manager_default_done(
+
+ if(script_status < 0)
+ {
+- request->failure_code =
++ request->failure_code =
+ GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_SCRIPT_STATUS;
+ globus_gram_job_manager_request_log(
+ request,
+@@ -1314,7 +1314,7 @@ globus_l_gram_job_manager_default_done(
+ globus_gram_job_manager_request_set_status(request, GLOBUS_GRAM_PROTOCOL_JOB_STATE_FAILED);
+ if(script_status <= 0)
+ {
+- request->failure_code =
++ request->failure_code =
+ GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_SCRIPT_STATUS;
+ globus_gram_job_manager_request_log(
+ request,
+@@ -1460,7 +1460,7 @@ globus_l_gram_job_manager_default_done(
+ else if(request->jobmanager_state == starting_jobmanager_state)
+ {
+ globus_gram_job_manager_request_set_status(request, GLOBUS_GRAM_PROTOCOL_JOB_STATE_FAILED);
+- request->failure_code =
++ request->failure_code =
+ GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_SCRIPT_STATUS;
+ request->unsent_status_change = GLOBUS_TRUE;
+ globus_gram_job_manager_request_log(
+@@ -1523,7 +1523,7 @@ globus_l_gram_job_manager_query_done(
+
+ if(script_status <= 0)
+ {
+- query->failure_code =
++ query->failure_code =
+ GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_SCRIPT_STATUS;
+ }
+ else
+@@ -1537,7 +1537,7 @@ globus_l_gram_job_manager_query_done(
+
+ if(script_status <= 0)
+ {
+- query->failure_code =
++ query->failure_code =
+ GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_SCRIPT_STATUS;
+ }
+ else if((query->type == GLOBUS_GRAM_JOB_MANAGER_CANCEL ||
+@@ -1560,7 +1560,7 @@ globus_l_gram_job_manager_query_done(
+ globus_i_gram_job_manager_script_valid_state_change(
+ request,
+ script_status))
+-
++
+ {
+ globus_gram_job_manager_request_set_status(request, script_status);
+ request->unsent_status_change = GLOBUS_TRUE;
+@@ -1582,7 +1582,7 @@ globus_l_gram_job_manager_query_done(
+ }
+ else
+ {
+- query->failure_code =
++ query->failure_code =
+ GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_SCRIPT_STATUS;
+ }
+
+@@ -1726,7 +1726,7 @@ globus_l_gram_enqueue_rsl(
+ {
+ return 0;
+ }
+-
++
+ rc = globus_l_gram_enqueue_string(
+ fifo,
+ " '%s' => ",
+@@ -2019,7 +2019,7 @@ globus_l_gram_request_validate(
+ -rc,
+ errno,
+ strerror(errno));
+-
++
+ goto script_path_not_found;
+ }
+
+@@ -2088,7 +2088,7 @@ globus_l_gram_request_validate(
+ -rc,
+ errno,
+ strerror(errno));
+-
++
+ goto lrm_module_not_found;
+ }
+
+@@ -2334,7 +2334,7 @@ globus_i_gram_job_manager_script_valid_state_change(
+ /**
+ * Queue and perhaps start a job manager script
+ *
+- * If the job manager isn't currently running too many simultaneous scripts,
++ * If the job manager isn't currently running too many simultaneous scripts,
+ * start the script described in the @a context parameter. Otherwise, queue
+ * it in the manager's script fifo and it will start when another one finishes.
+ *
+@@ -2463,11 +2463,11 @@ fifo_enqueue_failed:
+ *
+ * For each script context queued in the script fifo, either write its command
+ * to an existing XIO handle or create a new XIO handle to process the script,
+- * provided there are slots available for running more scripts.
++ * provided there are slots available for running more scripts.
+ *
+ * The mutex associated with the @a manager parameter must be locked when this
+ * procedure is called.
+- *
++ *
+ * @param manager
+ * Job manager state
+ * @param scripts
+@@ -2517,7 +2517,7 @@ globus_l_gram_process_script_queue_locked(
+ continue;
+ }
+ }
+- else
++ else
+ {
+ /* Create a new script if more slots are available */
+ assert(scripts->script_slots_available > 0);
+@@ -2605,7 +2605,7 @@ globus_l_gram_script_open_callback(
+ request->job_stats.client_address
+ ? request->job_stats.client_address
+ : (void *) GLOBUS_GRAM_SCRIPT_NO_CLIENT));
+-
++
+ globus_xio_register_close(
+ handle,
+ NULL,
+@@ -2640,7 +2640,7 @@ globus_l_gram_script_open_callback(
+ static
+ int
+ globus_l_gram_script_register_read_and_write(
+- globus_gram_job_manager_script_context_t *
++ globus_gram_job_manager_script_context_t *
+ script_context)
+ {
+ int i, total_iov_contents;
+@@ -2648,7 +2648,7 @@ globus_l_gram_script_register_read_and_write(
+ globus_gram_job_manager_t * manager;
+ globus_gram_jobmanager_request_t * request = script_context->request;
+ globus_gram_job_manager_scripts_t * scripts;
+-
++
+ manager = script_context->handle->manager;
+
+ scripts = globus_list_first(
+@@ -2796,7 +2796,7 @@ malloc_iov_failed:
+ *
+ * @param manager
+ * Job manager state
+- *
++ *
+ * @return void
+ */
+ static
+diff --git a/gram/jobmanager/source/logging.c b/gram/jobmanager/source/logging.c
+index 211906edc..8f0773301 100644
+--- a/gram/jobmanager/source/logging.c
++++ b/gram/jobmanager/source/logging.c
+@@ -137,12 +137,12 @@ globus_gram_job_manager_logging_destroy(void)
+ if (globus_i_gram_job_manager_log_sys)
+ {
+ globus_logging_destroy(globus_i_gram_job_manager_log_sys);
+- globus_i_gram_job_manager_log_sys = NULL;
++ globus_i_gram_job_manager_log_sys = NULL;
+ }
+ if (globus_i_gram_job_manager_log_stdio)
+ {
+ globus_logging_destroy(globus_i_gram_job_manager_log_stdio);
+- globus_i_gram_job_manager_log_stdio = NULL;
++ globus_i_gram_job_manager_log_stdio = NULL;
+ }
+ globus_symboltable_destroy(
+ &globus_l_gram_log_symboltable);
+@@ -269,7 +269,7 @@ globus_l_gram_logging_write(
+ symboltable,
+ DATE_SYMBOL,
+ now_str);
+-
++
+ globus_gram_job_manager_rsl_eval_string(
+ symboltable,
+ log_pattern,
+--
+2.54.0
+
diff --git a/0002-Fix-compiler-and-doxygen-warnings.patch b/0002-Fix-compiler-and-doxygen-warnings.patch
new file mode 100644
index 0000000..14a70b3
--- /dev/null
+++ b/0002-Fix-compiler-and-doxygen-warnings.patch
@@ -0,0 +1,372 @@
+From 4ee08d13e2963309e2063dc45dedd067337d3b76 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 May 2026 00:15:37 +0200
+Subject: [PATCH 2/2] Fix compiler and doxygen warnings
+
+---
+ .../source/globus_gram_job_manager.c | 6 ++----
+ .../source/globus_gram_job_manager_query.c | 14 ++++++--------
+ .../source/globus_gram_job_manager_script.c | 6 ++----
+ gram/jobmanager/source/logging.c | 3 +--
+ .../test/client/restart-to-new-url-test.c | 18 +++++++-----------
+ .../source/test/client/stdio-update-test.c | 18 +++++++-----------
+ 6 files changed, 25 insertions(+), 40 deletions(-)
+
+diff --git a/gram/jobmanager/source/globus_gram_job_manager.c b/gram/jobmanager/source/globus_gram_job_manager.c
+index fd30ad534..6c03aecf3 100644
+--- a/gram/jobmanager/source/globus_gram_job_manager.c
++++ b/gram/jobmanager/source/globus_gram_job_manager.c
+@@ -2771,7 +2771,6 @@ globus_l_gram_ref_swap_out(
+
+ globus_gram_job_manager_ref_t * ref = arg;
+ globus_gram_jobmanager_request_t * request;
+- int rc;
+
+ globus_gram_job_manager_log(
+ ref->manager,
+@@ -2883,7 +2882,7 @@ globus_l_gram_ref_swap_out(
+ "No new references to job, writing state and freeing data");
+
+ /* Is this needed? */
+- rc = globus_gram_job_manager_state_file_write(ref->request);
++ globus_gram_job_manager_state_file_write(ref->request);
+
+ globus_gram_job_manager_request_free(ref->request);
+ free(ref->request);
+@@ -2916,7 +2915,6 @@ globus_l_gram_add_reference_locked(
+ globus_gram_jobmanager_request_t ** request)
+ {
+ int rc = GLOBUS_SUCCESS;
+- globus_result_t result;
+ globus_gram_job_manager_ref_t * ref;
+
+ globus_gram_job_manager_log(
+@@ -2936,7 +2934,7 @@ globus_l_gram_add_reference_locked(
+
+ if (ref->cleanup_timer != GLOBUS_NULL_HANDLE)
+ {
+- result = globus_callback_unregister(
++ globus_callback_unregister(
+ ref->cleanup_timer,
+ NULL,
+ NULL,
+diff --git a/gram/jobmanager/source/globus_gram_job_manager_query.c b/gram/jobmanager/source/globus_gram_job_manager_query.c
+index eab9611fc..4ef5632c1 100644
+--- a/gram/jobmanager/source/globus_gram_job_manager_query.c
++++ b/gram/jobmanager/source/globus_gram_job_manager_query.c
+@@ -536,7 +536,6 @@ globus_l_gram_job_manager_cancel(
+ globus_bool_t * reply)
+ {
+ int rc = GLOBUS_SUCCESS;
+- globus_result_t result;
+ globus_gram_job_manager_query_t * query;
+ globus_reltime_t delay;
+
+@@ -561,7 +560,7 @@ globus_l_gram_job_manager_cancel(
+ if(request->poll_timer != GLOBUS_HANDLE_TABLE_NO_HANDLE)
+ {
+ GlobusTimeReltimeSet(delay, 0, 0);
+- result = globus_callback_adjust_oneshot(
++ globus_callback_adjust_oneshot(
+ request->poll_timer,
+ &delay);
+ }
+@@ -600,7 +599,7 @@ globus_l_gram_job_manager_cancel(
+ if(request->poll_timer != GLOBUS_HANDLE_TABLE_NO_HANDLE)
+ {
+ GlobusTimeReltimeSet(delay, 0, 0);
+- result = globus_callback_adjust_oneshot(
++ globus_callback_adjust_oneshot(
+ request->poll_timer,
+ &delay);
+ }
+@@ -794,7 +793,6 @@ globus_l_gram_job_manager_signal(
+ globus_off_t err_size = -1;
+ globus_reltime_t delay;
+ globus_gram_job_manager_query_t * query;
+- globus_result_t result;
+
+ globus_gram_job_manager_request_log(
+ request,
+@@ -816,7 +814,7 @@ globus_l_gram_job_manager_signal(
+ {
+ return GLOBUS_GRAM_PROTOCOL_ERROR_HTTP_UNPACK_FAILED;
+ }
+- after_signal = strchr(args,' ');
++ after_signal = (char *) strchr(args,' ');
+ if (after_signal)
+ *after_signal++ = '\0';
+
+@@ -985,7 +983,7 @@ globus_l_gram_job_manager_signal(
+ if(request->poll_timer != GLOBUS_HANDLE_TABLE_NO_HANDLE)
+ {
+ GlobusTimeReltimeSet(delay, 0, 0);
+- result = globus_callback_adjust_oneshot(
++ globus_callback_adjust_oneshot(
+ request->poll_timer,
+ &delay);
+ }
+@@ -1099,7 +1097,7 @@ globus_l_gram_job_manager_signal(
+ if(request->poll_timer != GLOBUS_HANDLE_TABLE_NO_HANDLE)
+ {
+ GlobusTimeReltimeSet(delay, 0, 0);
+- result = globus_callback_adjust_oneshot(
++ globus_callback_adjust_oneshot(
+ request->poll_timer,
+ &delay);
+ }
+@@ -1180,7 +1178,7 @@ globus_l_gram_job_manager_signal(
+ if(request->poll_timer != GLOBUS_HANDLE_TABLE_NO_HANDLE)
+ {
+ GlobusTimeReltimeSet(delay, 0, 0);
+- result = globus_callback_adjust_oneshot(
++ globus_callback_adjust_oneshot(
+ request->poll_timer,
+ &delay);
+ }
+diff --git a/gram/jobmanager/source/globus_gram_job_manager_script.c b/gram/jobmanager/source/globus_gram_job_manager_script.c
+index 907957c15..a37d5fc35 100644
+--- a/gram/jobmanager/source/globus_gram_job_manager_script.c
++++ b/gram/jobmanager/source/globus_gram_job_manager_script.c
+@@ -1246,7 +1246,6 @@ globus_l_gram_job_manager_default_done(
+ const char * value)
+ {
+ int script_status;
+- int rc;
+
+ GlobusGramJobManagerRequestLock(request);
+
+@@ -1258,7 +1257,7 @@ globus_l_gram_job_manager_default_done(
+ {
+ globus_reltime_t delay;
+ GlobusTimeReltimeSet(delay, 0, 0);
+- rc = globus_gram_job_manager_state_machine_register(
++ globus_gram_job_manager_state_machine_register(
+ request->manager,
+ request,
+ &delay);
+@@ -1499,7 +1498,6 @@ globus_l_gram_job_manager_query_done(
+ int script_status;
+ globus_gram_job_manager_query_t * query;
+ globus_reltime_t delay;
+- int rc;
+
+ query = arg;
+
+@@ -1512,7 +1510,7 @@ globus_l_gram_job_manager_query_done(
+ if(!variable)
+ {
+ GlobusTimeReltimeSet(delay, 0, 0);
+- rc = globus_gram_job_manager_state_machine_register(
++ globus_gram_job_manager_state_machine_register(
+ request->manager,
+ request,
+ &delay);
+diff --git a/gram/jobmanager/source/logging.c b/gram/jobmanager/source/logging.c
+index 8f0773301..f7343f612 100644
+--- a/gram/jobmanager/source/logging.c
++++ b/gram/jobmanager/source/logging.c
+@@ -225,7 +225,6 @@ globus_l_gram_logging_write(
+ static char * last_path = NULL;
+ int fd;
+ int flags;
+- int rc;
+ globus_gram_jobmanager_request_t * request;
+ globus_symboltable_t * symboltable;
+
+@@ -318,7 +317,7 @@ globus_l_gram_logging_write(
+ if (flags >= 0)
+ {
+ flags |= FD_CLOEXEC;
+- rc = fcntl(fd, F_SETFD, flags);
++ fcntl(fd, F_SETFD, flags);
+ }
+ }
+ }
+diff --git a/gram/jobmanager/source/test/client/restart-to-new-url-test.c b/gram/jobmanager/source/test/client/restart-to-new-url-test.c
+index 55833d695..c0690f21d 100644
+--- a/gram/jobmanager/source/test/client/restart-to-new-url-test.c
++++ b/gram/jobmanager/source/test/client/restart-to-new-url-test.c
+@@ -131,7 +131,6 @@ test_l_old_accept_callback(
+ globus_gass_transfer_request_t request)
+ {
+ test_monitor_t *monitor = callback_arg;
+- int rc;
+
+ globus_mutex_lock(&monitor->mutex);
+ monitor->old_request = request;
+@@ -141,14 +140,14 @@ test_l_old_accept_callback(
+ request,
+ GLOBUS_GASS_TRANSFER_LENGTH_UNKNOWN);
+
+- rc = globus_gass_transfer_receive_bytes(
++ globus_gass_transfer_receive_bytes(
+ request,
+ monitor->old_output,
+ sizeof(monitor->old_output),
+ 1,
+ test_l_data_callback,
+ monitor);
+- rc = globus_gass_transfer_register_listen(
++ globus_gass_transfer_register_listen(
+ monitor->old_listener,
+ test_l_old_listener_callback,
+ monitor);
+@@ -161,25 +160,24 @@ test_l_new_accept_callback(
+ globus_gass_transfer_request_t request)
+ {
+ test_monitor_t *monitor = callback_arg;
+- int rc;
+
+ globus_mutex_lock(&monitor->mutex);
+ monitor->new_request = request;
+ globus_mutex_unlock(&monitor->mutex);
+
+
+- rc = globus_gass_transfer_authorize(
++ globus_gass_transfer_authorize(
+ request,
+ GLOBUS_GASS_TRANSFER_LENGTH_UNKNOWN);
+
+- rc = globus_gass_transfer_receive_bytes(
++ globus_gass_transfer_receive_bytes(
+ request,
+ monitor->new_output,
+ sizeof(monitor->new_output),
+ 1,
+ test_l_data_callback,
+ monitor);
+- rc = globus_gass_transfer_register_listen(
++ globus_gass_transfer_register_listen(
+ monitor->new_listener,
+ test_l_new_listener_callback,
+ monitor);
+@@ -190,7 +188,6 @@ test_l_old_listener_callback(
+ void * callback_arg,
+ globus_gass_transfer_listener_t listener)
+ {
+- int rc;
+ globus_gass_transfer_request_t request;
+ globus_gass_transfer_requestattr_t attr;
+
+@@ -200,7 +197,7 @@ test_l_old_listener_callback(
+ GLOBUS_GASS_TRANSFER_AUTHORIZE_SELF,
+ "https");
+
+- rc = globus_gass_transfer_register_accept(
++ globus_gass_transfer_register_accept(
+ &request,
+ &attr,
+ listener,
+@@ -215,7 +212,6 @@ test_l_new_listener_callback(
+ void * callback_arg,
+ globus_gass_transfer_listener_t listener)
+ {
+- int rc;
+ globus_gass_transfer_request_t request;
+ globus_gass_transfer_requestattr_t attr;
+
+@@ -225,7 +221,7 @@ test_l_new_listener_callback(
+ GLOBUS_GASS_TRANSFER_AUTHORIZE_SELF,
+ "https");
+
+- rc = globus_gass_transfer_register_accept(
++ globus_gass_transfer_register_accept(
+ &request,
+ &attr,
+ listener,
+diff --git a/gram/jobmanager/source/test/client/stdio-update-test.c b/gram/jobmanager/source/test/client/stdio-update-test.c
+index 9c22c1976..85b2e3118 100644
+--- a/gram/jobmanager/source/test/client/stdio-update-test.c
++++ b/gram/jobmanager/source/test/client/stdio-update-test.c
+@@ -114,7 +114,6 @@ test_l_old_accept_callback(
+ globus_gass_transfer_request_t request)
+ {
+ test_monitor_t *monitor = callback_arg;
+- int rc;
+
+ globus_mutex_lock(&monitor->mutex);
+ monitor->old_request = request;
+@@ -124,14 +123,14 @@ test_l_old_accept_callback(
+ request,
+ GLOBUS_GASS_TRANSFER_LENGTH_UNKNOWN);
+
+- rc = globus_gass_transfer_receive_bytes(
++ globus_gass_transfer_receive_bytes(
+ request,
+ monitor->old_output,
+ sizeof(monitor->old_output),
+ 1,
+ test_l_data_callback,
+ monitor);
+- rc = globus_gass_transfer_register_listen(
++ globus_gass_transfer_register_listen(
+ monitor->old_listener,
+ test_l_old_listener_callback,
+ monitor);
+@@ -144,25 +143,24 @@ test_l_new_accept_callback(
+ globus_gass_transfer_request_t request)
+ {
+ test_monitor_t *monitor = callback_arg;
+- int rc;
+
+ globus_mutex_lock(&monitor->mutex);
+ monitor->new_request = request;
+ globus_mutex_unlock(&monitor->mutex);
+
+
+- rc = globus_gass_transfer_authorize(
++ globus_gass_transfer_authorize(
+ request,
+ GLOBUS_GASS_TRANSFER_LENGTH_UNKNOWN);
+
+- rc = globus_gass_transfer_receive_bytes(
++ globus_gass_transfer_receive_bytes(
+ request,
+ monitor->new_output,
+ sizeof(monitor->new_output),
+ 1,
+ test_l_data_callback,
+ monitor);
+- rc = globus_gass_transfer_register_listen(
++ globus_gass_transfer_register_listen(
+ monitor->new_listener,
+ test_l_new_listener_callback,
+ monitor);
+@@ -173,7 +171,6 @@ test_l_old_listener_callback(
+ void * callback_arg,
+ globus_gass_transfer_listener_t listener)
+ {
+- int rc;
+ globus_gass_transfer_request_t request;
+ globus_gass_transfer_requestattr_t attr;
+
+@@ -183,7 +180,7 @@ test_l_old_listener_callback(
+ GLOBUS_GASS_TRANSFER_AUTHORIZE_SELF,
+ "https");
+
+- rc = globus_gass_transfer_register_accept(
++ globus_gass_transfer_register_accept(
+ &request,
+ &attr,
+ listener,
+@@ -198,7 +195,6 @@ test_l_new_listener_callback(
+ void * callback_arg,
+ globus_gass_transfer_listener_t listener)
+ {
+- int rc;
+ globus_gass_transfer_request_t request;
+ globus_gass_transfer_requestattr_t attr;
+
+@@ -208,7 +204,7 @@ test_l_new_listener_callback(
+ GLOBUS_GASS_TRANSFER_AUTHORIZE_SELF,
+ "https");
+
+- rc = globus_gass_transfer_register_accept(
++ globus_gass_transfer_register_accept(
+ &request,
+ &attr,
+ listener,
+--
+2.54.0
+
diff --git a/globus-gram-job-manager.spec b/globus-gram-job-manager.spec
index a8ae46f..f6f7fe8 100644
--- a/globus-gram-job-manager.spec
+++ b/globus-gram-job-manager.spec
@@ -1,13 +1,15 @@
Name: globus-gram-job-manager
%global _name %(tr - _ <<< %{name})
Version: 15.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Grid Community Toolkit - GRAM Jobmanager
License: Apache-2.0
URL: https://github.com/gridcf/gct/
Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz
Source8: README
+Patch0: 0001-Untabify-and-remove-trailing-white-space.patch
+Patch1: 0002-Fix-compiler-and-doxygen-warnings.patch
BuildRequires: make
BuildRequires: gcc
@@ -93,6 +95,8 @@ Scheduler Event Generator Job Manager
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p4
+%patch -P1 -p4
%build
# Reduce overlinking
@@ -161,6 +165,9 @@ GLOBUS_HOSTNAME=localhost %make_build check
%{_libdir}/libglobus_seg_job_manager.so
%changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 15.10-3
+- Fix compiler warnings
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 15.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
reply other threads:[~2026-06-14 8:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178142684738.1.4826885703607525369.rpms-globus-gram-job-manager-27bae8287e35@fedoraproject.org \
--to=mattias.ellert@physics.uu.se \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox