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-gfork] rawhide: Fix compiler warnings
Date: Sun, 14 Jun 2026 08:46:52 GMT [thread overview]
Message-ID: <178142681200.1.5991862346148917131.rpms-globus-gfork-1cd7777c0db2@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/globus-gfork
Branch : rawhide
Commit : 1cd7777c0db29393848f8fca424e9d9a42d9c353
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +283/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/globus-gfork/c/1cd7777c0db29393848f8fca424e9d9a42d9c353?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..2279acc
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,180 @@
+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
+
+---
+ gridftp/gfork/source/globus_gfork_server.c | 42 +++++++++++-----------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/gridftp/gfork/source/globus_gfork_server.c b/gridftp/gfork/source/globus_gfork_server.c
+index abb63b012..13735cc9a 100644
+--- a/gridftp/gfork/source/globus_gfork_server.c
++++ b/gridftp/gfork/source/globus_gfork_server.c
+@@ -53,7 +53,7 @@ gfork_accept_allowed()
+ {
+ return GLOBUS_TRUE;
+ }
+-
++
+ return (gfork_l_connection_count < gfork_l_options.instances);
+ }
+
+@@ -104,7 +104,7 @@ gfork_kid_set_keeper_envs(
+
+ globus_list_insert(&new_list, globus_libc_strdup(val_s));
+ }
+-
++
+
+ for(i = 0; gfork_l_keep_envs[i] != NULL; i++)
+ {
+@@ -120,16 +120,16 @@ gfork_kid_set_keeper_envs(
+ }
+
+ /* set extra envs */
+- kv_pair = globus_common_create_string("%s=%d",
++ kv_pair = globus_common_create_string("%s=%d",
+ GFORK_CHILD_READ_ENV, read_fd);
+ globus_list_insert(&new_list, kv_pair);
+- kv_pair = globus_common_create_string("%s=%d",
++ kv_pair = globus_common_create_string("%s=%d",
+ GFORK_CHILD_WRITE_ENV, write_fd);
+ globus_list_insert(&new_list, kv_pair);
+- kv_pair = globus_common_create_string("%s=%s",
++ kv_pair = globus_common_create_string("%s=%s",
+ GFORK_CHILD_CS_ENV, g_contact_string);
+ globus_list_insert(&new_list, kv_pair);
+- kv_pair = globus_common_create_string("%s=%d",
++ kv_pair = globus_common_create_string("%s=%d",
+ GFORK_CHILD_INSTANCE_ENV, gfork_l_options.instances);
+ globus_list_insert(&new_list, kv_pair);
+
+@@ -224,7 +224,7 @@ gfork_l_kid_read_close_cb(
+ globus_xio_handle_t handle,
+ globus_result_t result,
+ void * user_arg)
+-{
++{
+ globus_list_t * list;
+ gfork_i_child_handle_t * kid_handle;
+ gfork_i_state_t tmp_state;
+@@ -253,7 +253,7 @@ gfork_l_kid_read_close_cb(
+ }
+ globus_fifo_destroy(&kid_handle->write_q);
+ globus_free(kid_handle);
+-
++
+ globus_cond_signal(&gfork_l_cond);
+ }
+ globus_mutex_unlock(&gfork_l_mutex);
+@@ -267,7 +267,7 @@ gfork_l_kid_write_close_cb(
+ globus_xio_handle_t handle,
+ globus_result_t result,
+ void * user_arg)
+-{
++{
+ gfork_i_child_handle_t * kid_handle;
+
+ kid_handle = (gfork_i_child_handle_t *) user_arg;
+@@ -332,7 +332,7 @@ gfork_l_write_open_cb(
+ sizeof(gfork_i_msg_header_t),
+ NULL,
+ gfork_l_read_header_cb,
+- msg);
++ msg);
+ if(result != GLOBUS_SUCCESS)
+ {
+ goto error_post;
+@@ -426,7 +426,7 @@ gfork_i_write_close(
+ gfork_i_child_handle_t * kid_handle)
+ {
+ globus_result_t result;
+- globus_list_t * list;
++ globus_list_t * list;
+ gfork_i_msg_t * msg;
+
+ globus_hashtable_to_list(&gfork_l_master_pid_table, &list);
+@@ -434,7 +434,7 @@ gfork_i_write_close(
+ {
+ gfork_i_child_handle_t * ms_kid;
+ ms_kid = (gfork_i_child_handle_t *) globus_list_remove(&list, list);
+-
++
+ msg = (gfork_i_msg_t *) globus_calloc(1, sizeof(gfork_i_msg_t));
+ msg->header.type = GLOBUS_GFORK_MSG_CLOSE;
+ msg->header.from_pid = kid_handle->pid;
+@@ -610,7 +610,7 @@ gfork_l_spawn_master(
+ sizeof(gfork_i_msg_header_t),
+ NULL,
+ gfork_l_read_header_cb,
+- msg);
++ msg);
+ if(result != GLOBUS_SUCCESS)
+ {
+ goto error_read_post;
+@@ -690,7 +690,7 @@ gfork_l_dead_kid(
+ globus_assert(list != NULL);
+
+ globus_list_remove(&gfork_l_pid_list, list);
+- gfork_log(2, "Cleaned up child %d, list is at %d\n",
++ gfork_log(2, "Cleaned up child %d, list is at %d\n",
+ child_pid, globus_list_size(gfork_l_pid_list));
+
+ globus_cond_signal(&gfork_l_cond);
+@@ -1107,7 +1107,7 @@ error_contact:
+ }
+
+ /*
+- * post for in child. Never returns from here
++ * post for in child. Never returns from here
+ */
+ static
+ void
+@@ -1174,7 +1174,7 @@ gfork_i_opts_unknown(
+
+ /******************** IO functions ****************************/
+ static
+-void
++void
+ gfork_l_read_body_cb(
+ globus_xio_handle_t handle,
+ globus_result_t result,
+@@ -1283,7 +1283,7 @@ gfork_l_read_body_cb(
+ gfork_l_write(ms_kid);
+ }
+ }
+-
++
+ gfork_log(1, "posting header read on %d for %d bytes\n",
+ msg->from_kid->pid, sizeof(gfork_i_msg_header_t));
+ result = globus_xio_register_read(
+@@ -1496,9 +1496,9 @@ gfork_l_write(
+
+ error_register:
+
+- return;
++ return;
+ }
+-
++
+
+
+
+@@ -1590,11 +1590,11 @@ main(
+ }
+
+ #ifndef BUILD_LITE
+-/* when threaded add a periodic callback to simulate the SIGCHLD signal, since
++/* when threaded add a periodic callback to simulate the SIGCHLD signal, since
+ * many versions of LinuxThreads don't seem to pass that to right thread */
+ {
+ globus_reltime_t delay;
+-
++
+ GlobusTimeReltimeSet(delay, 10, 0);
+ result = globus_callback_register_periodic(
+ NULL,
+--
+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..5f499d2
--- /dev/null
+++ b/0002-Fix-compiler-and-doxygen-warnings.patch
@@ -0,0 +1,95 @@
+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
+
+---
+ gridftp/gfork/source/globus_gfork_server.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/gridftp/gfork/source/globus_gfork_server.c b/gridftp/gfork/source/globus_gfork_server.c
+index 13735cc9a..64db5b262 100644
+--- a/gridftp/gfork/source/globus_gfork_server.c
++++ b/gridftp/gfork/source/globus_gfork_server.c
+@@ -388,12 +388,10 @@ gfork_l_write_close_cb(
+ globus_xio_data_descriptor_t data_desc,
+ void * user_arg)
+ {
+- gfork_i_child_handle_t * kid_handle;
+ gfork_i_child_handle_t * ms_handle;
+ gfork_i_msg_t * msg;
+
+ msg = (gfork_i_msg_t *) user_arg;
+- kid_handle = msg->from_kid;
+ ms_handle = msg->to_kid;
+
+ globus_mutex_lock(&gfork_l_mutex);
+@@ -495,17 +493,13 @@ gfork_l_spawn_master(
+ pid_t pid;
+ int infds[2];
+ int outfds[2];
+- int read_fd;
+- int write_fd;
+ int rc;
+- gfork_i_options_t * gfork_h;
+ globus_result_t result;
+ gfork_i_msg_t * msg;
+ globus_list_t * child_env_list;
+ gfork_i_child_handle_t * master_child_handle = NULL;
+ GForkFuncName(gfork_l_spawn_master);
+
+- gfork_h = &gfork_l_options;
+ if(ms_ent->master == NULL)
+ {
+ gfork_log(1, "There is no master program.\n");
+@@ -543,9 +537,6 @@ gfork_l_spawn_master(
+ close(outfds[1]);
+ close(infds[0]);
+
+- read_fd = outfds[0];
+- write_fd = infds[1];
+-
+ environ = child_env;
+
+ nice(ms_ent->master_nice);
+@@ -703,7 +694,6 @@ gfork_l_sigchld(
+ {
+ int child_pid;
+ int child_status;
+- int child_rc;
+ globus_bool_t dead;
+
+ gfork_log(2, "Sigint child\n");
+@@ -715,7 +705,6 @@ gfork_l_sigchld(
+ if(WIFEXITED(child_status))
+ {
+ /* normal exit */
+- child_rc = WEXITSTATUS(child_status);
+ dead = GLOBUS_TRUE;
+ }
+ else if(WIFSIGNALED(child_status))
+@@ -1118,7 +1107,6 @@ gfork_new_child(
+ int write_fd,
+ globus_list_t * list)
+ {
+- globus_result_t res;
+ int rc = 1;
+ GlobusGForkFuncName(gfork_new_child);
+
+@@ -1132,13 +1120,11 @@ gfork_new_child(
+ rc = dup2(socket_handle, STDIN_FILENO);
+ if(rc < 0)
+ {
+- res = GForkErrorErrno(strerror, errno);
+ goto error_dupin;
+ }
+ rc = dup2(socket_handle, STDOUT_FILENO);
+ if(rc < 0)
+ {
+- res = GForkErrorErrno(strerror, errno);
+ goto error_dupout;
+ }
+ close(socket_handle);
+--
+2.54.0
+
diff --git a/globus-gfork.spec b/globus-gfork.spec
index bf6b964..1d42484 100644
--- a/globus-gfork.spec
+++ b/globus-gfork.spec
@@ -1,13 +1,15 @@
Name: globus-gfork
%global _name %(tr - _ <<< %{name})
Version: 5.0
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Grid Community Toolkit - GFork
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
@@ -57,6 +59,8 @@ GFork Development Files
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p4
+%patch -P1 -p4
%build
# Reduce overlinking
@@ -108,6 +112,9 @@ echo "# This is the default gfork configuration file" > \
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 5.0-20
+- Fix compiler warnings
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
reply other threads:[~2026-06-14 8:46 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=178142681200.1.5991862346148917131.rpms-globus-gfork-1cd7777c0db2@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