public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/globus-xio-gridftp-multicast] rawhide: Fix compiler warnings
@ 2026-06-14 8:55 Mattias Ellert
0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-06-14 8:55 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/globus-xio-gridftp-multicast
Branch : rawhide
Commit : eb26e34a535d2c93cc96955ea1494ea03e75092d
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +232/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/globus-xio-gridftp-multicast/c/eb26e34a535d2c93cc96955ea1494ea03e75092d?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..c1a85f6
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,184 @@
+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
+
+---
+ .../globus_xio_gridftp_multicast_driver.c | 44 +++++++++----------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c b/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c
+index dddb69886..d9d405e0f 100644
+--- a/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c
++++ b/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c
+@@ -21,12 +21,12 @@
+ * use is for multicast broad casts in the gridftp server.
+ *
+ * If an error occurs on any one gridftp handle it is not imediately
+- * reported to the user. It is reecorded and no futher buffers will be
+- * passed down that connection. Upon closing the handle all errors
++ * reported to the user. It is reecorded and no futher buffers will be
++ * passed down that connection. Upon closing the handle all errors
+ * are reported.
+ *
+ * However, if a pass error occurs it is reported immediately and all
+- * active ftp connections are terminated.
++ * active ftp connections are terminated.
+ *
+ * The user is not required to actually pass data down the stack. In
+ * some cases they will want buffers to hop around servers in a network
+@@ -37,7 +37,7 @@
+ */
+ #include "globus_xio_driver.h"
+ #include "globus_xio_gridftp_multicast_driver.h"
+-#include "globus_ftp_client.h"
++#include "globus_ftp_client.h"
+ #include "version.h"
+
+ GlobusDebugDefine(GLOBUS_XIO_GRIDFTP_MULTICAST);
+@@ -73,7 +73,7 @@ GlobusXIODeclareDriver(gridftp_multicast);
+ __FILE__, \
+ _xio_name, \
+ __LINE__, \
+- _XIOSL(_reason))
++ _XIOSL(_reason))
+
+ #define GMC_ERROR_TOKEN "GMC_ERROR=\n"
+ #define GMC_URL_ENC_CHAR "#;:=+ ,"
+@@ -236,7 +236,7 @@ xio_l_gmc_handle_destroy(
+
+ globus_ftp_client_handleattr_destroy(&ftp_handle->handle_attr);
+ globus_ftp_client_operationattr_destroy(&ftp_handle->op_attr);
+- /* free up the client lib stuff
++ /* free up the client lib stuff
+ globus_ftp_client_handle_t client_h;
+ */
+ }
+@@ -451,20 +451,20 @@ error_xio_system_activate:
+ static
+ int
+ xio_l_gridftp_multicast_deactivate()
+-{
++{
+ int rc;
+ GlobusXIOName(xio_l_gridftp_multicast_deactivate);
+-
++
+ GlobusXIOGridftpMulticastDebugEnter();
+ GlobusXIOUnRegisterDriver(gridftp_multicast);
+ rc = globus_module_deactivate(GLOBUS_FTP_CLIENT_MODULE);
+ if (rc != GLOBUS_SUCCESS)
+- {
++ {
+ goto error_deactivate;
+ }
+ rc = globus_module_deactivate(GLOBUS_XIO_MODULE);
+ if (rc != GLOBUS_SUCCESS)
+- {
++ {
+ goto error_deactivate;
+ }
+ GlobusXIOGridftpMulticastDebugExit();
+@@ -756,7 +756,7 @@ xio_l_gridftp_multicast_open(
+ 1, sizeof(xio_l_gridftp_multicast_handle_t));
+ globus_mutex_init(&handle->mutex, NULL);
+ handle->local_url = strdup(contact_info->unparsed);
+- handle->P = attr->P;
++ handle->P = attr->P;
+ handle->tcp_bs = attr->tcp_bs;
+ handle->pass_write = attr->pass_write;
+
+@@ -922,7 +922,7 @@ xio_l_gmc_destroy_forwarder(
+
+ ftp_handle->closing = GLOBUS_TRUE;
+ result = globus_ftp_client_abort(&ftp_handle->client_h);
+-
++
+ /* not the ost interesting error, but we will hang onto it if there
+ wasnt a better one around */
+ if(result != GLOBUS_SUCCESS && ftp_handle->result == GLOBUS_SUCCESS)
+@@ -1239,7 +1239,7 @@ xio_l_gridftp_multicast_write(
+ globus_off_t offset;
+ globus_bool_t finish_write = GLOBUS_FALSE;
+ GlobusXIOName(xio_l_gridftp_multicast_write);
+-
++
+ handle = (xio_l_gridftp_multicast_handle_t *) driver_specific_handle;
+
+ globus_mutex_lock(&handle->mutex);
+@@ -1253,8 +1253,8 @@ xio_l_gridftp_multicast_write(
+ {
+ ftp_handle = &handle->ftp_handles[i];
+ offset = handle->offset;
+- for(j = 0;
+- j < iovec_count &&
++ for(j = 0;
++ j < iovec_count &&
+ ftp_handle->result == GLOBUS_SUCCESS;
+ j++)
+ {
+@@ -1403,7 +1403,7 @@ xio_l_gmc_close_cb(
+ globus_bool_t finish_close = GLOBUS_FALSE;
+ xio_l_gridftp_multicast_handle_t * handle;
+ GlobusXIOName(xio_l_gmc_close_cb);
+-
++
+ handle = (xio_l_gridftp_multicast_handle_t *) user_arg;
+ globus_mutex_lock(&handle->mutex);
+ {
+@@ -1441,7 +1441,7 @@ xio_l_gridftp_multicast_close(
+ xio_l_gmc_ftp_handle_t * ftp_handle;
+ xio_l_gridftp_multicast_handle_t * handle;
+ GlobusXIOName(xio_l_gridftp_multicast_close);
+-
++
+ handle = (xio_l_gridftp_multicast_handle_t *) driver_specific_handle;
+
+ globus_mutex_lock(&handle->mutex);
+@@ -1503,7 +1503,7 @@ xio_l_gridftp_multicast_close(
+ handle->op_count++;
+ }
+ break;
+-
++
+ case XIO_GMC_STATE_OPENING_ERROR:
+ case XIO_GMC_STATE_OPENING:
+ case XIO_GMC_STATE_CLOSING:
+@@ -1582,7 +1582,7 @@ xio_l_gridftp_multicast_attr_init(
+ {
+ xio_l_gridftp_multicast_attr_t * attr;
+
+- attr = (xio_l_gridftp_multicast_attr_t *)
++ attr = (xio_l_gridftp_multicast_attr_t *)
+ globus_calloc(1, sizeof(xio_l_gridftp_multicast_attr_t));
+
+ globus_fifo_init(&attr->url_q);
+@@ -1591,14 +1591,14 @@ xio_l_gridftp_multicast_attr_init(
+ attr->tcp_bs = xio_l_gmc_default_attr.tcp_bs;
+ attr->cast_count = xio_l_gmc_default_attr.cast_count;
+ attr->pass_write = xio_l_gmc_default_attr.pass_write;
+-
++
+ *out_attr = attr;
+
+ return GLOBUS_SUCCESS;
+ }
+
+
+-static globus_xio_string_cntl_table_t
++static globus_xio_string_cntl_table_t
+ xio_l_gridftp_multicast_string_opts_table[] =
+ {
+ {"P", GLOBUS_XIO_GRIDFTP_MULTICAST_ATTR_PARALLEL,
+@@ -1680,7 +1680,7 @@ xio_l_gridftp_multicast_attr_copy(
+ {
+ int i;
+ char * str;
+- xio_l_gridftp_multicast_attr_t * dst_attr;
++ xio_l_gridftp_multicast_attr_t * dst_attr;
+ xio_l_gridftp_multicast_attr_t * src_attr;
+
+ src_attr = (xio_l_gridftp_multicast_attr_t *) src;
+--
+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..2b6c2b9
--- /dev/null
+++ b/0002-Fix-compiler-and-doxygen-warnings.patch
@@ -0,0 +1,40 @@
+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
+
+---
+ .../server/multi/source/globus_xio_gridftp_multicast_driver.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c b/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c
+index d9d405e0f..558d30071 100644
+--- a/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c
++++ b/gridftp/server/multi/source/globus_xio_gridftp_multicast_driver.c
+@@ -944,7 +944,6 @@ xio_l_gmc_setup_forwarder(
+ int max_str_len,
+ int each_cast_count)
+ {
+- int cast_count;
+ char * driver_del;
+ char * stack_str;
+ int stack_str_ndx;
+@@ -959,7 +958,6 @@ xio_l_gmc_setup_forwarder(
+
+ handle = ftp_handle->whos_my_daddy;
+
+- cast_count = 0;
+ stack_str = malloc(max_str_len*3); /* 3x for url encoding */
+ stack_str_ndx = 0;
+ for(i = 0; i < each_cast_count; i++)
+@@ -977,7 +975,6 @@ xio_l_gmc_setup_forwarder(
+ stack_str_ndx += strlen(str);
+
+ free(str);
+- cast_count++;
+ }
+ stack_str[stack_str_ndx] = '\0';
+ }
+--
+2.54.0
+
diff --git a/globus-xio-gridftp-multicast.spec b/globus-xio-gridftp-multicast.spec
index 483c349..62d357b 100644
--- a/globus-xio-gridftp-multicast.spec
+++ b/globus-xio-gridftp-multicast.spec
@@ -1,13 +1,15 @@
Name: globus-xio-gridftp-multicast
%global _name %(tr - _ <<< %{name})
Version: 2.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Grid Community Toolkit - Globus XIO GridFTP Multicast Driver
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
@@ -41,6 +43,8 @@ Globus XIO GridFTP Multicast Driver Development Files
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p5
+%patch -P1 -p5
%build
# Reduce overlinking
@@ -82,6 +86,9 @@ rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 2.2-11
+- Fix compiler warnings
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-14 8:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-14 8:55 [rpms/globus-xio-gridftp-multicast] rawhide: Fix compiler warnings Mattias Ellert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox