public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/globus-xio-gridftp-driver] rawhide: Fix compiler and doxygen warnings
@ 2026-06-14  8:54 Mattias Ellert
  0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-06-14  8:54 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/globus-xio-gridftp-driver
Branch : rawhide
Commit : 7323a998bae91fd6482b124aa88cc24cccf2aa7a
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-06-14T10:39:13+02:00
Stats  : +837/-1 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/globus-xio-gridftp-driver/c/7323a998bae91fd6482b124aa88cc24cccf2aa7a?branch=rawhide

Log:
Fix compiler and doxygen 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..ad97ca9
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,565 @@
+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_xio_gridftp_driver.h        | 148 +++++++++---------
+ .../source/test/globus_gridftp_driver_test.c  |  36 ++---
+ 2 files changed, 92 insertions(+), 92 deletions(-)
+
+diff --git a/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h b/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h
+index 344a14b4d..68e397fbd 100644
+--- a/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h
++++ b/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h
+@@ -28,7 +28,7 @@
+ #ifndef GLOBUS_GLOBAL_DOCUMENT_SET
+ /**
+  * @mainpage Globus XIO GridFTP Driver
+- * @copydoc globus_xio_gridftp_driver 
++ * @copydoc globus_xio_gridftp_driver
+  */
+ #endif
+ 
+@@ -41,12 +41,12 @@
+  * @addtogroup globus_xio_gridftp_driver
+  * @section globus_xio_gridftp_driver_handles Handles
+  *
+- * An XIO handle with the gridftp client driver can be created with 
+- * globus_xio_handle_create() 
++ * An XIO handle with the gridftp client driver can be created with
++ * globus_xio_handle_create()
+  *
+- * The GridFTP client driver makes use of globus ftp client library. 
+- * globus_xio_register_open() call creates a new ftp client handle (unless 
+- * one is set on the attr passed), establishes connection with the 
++ * The GridFTP client driver makes use of globus ftp client library.
++ * globus_xio_register_open() call creates a new ftp client handle (unless
++ * one is set on the attr passed), establishes connection with the
+  * GridFTP server. The contact string must contain the scheme, host name,
+  * and the resource, optionally it might contain port and subject also.
+  *
+@@ -60,12 +60,12 @@
+  *
+  * The globus_xio_register_read() enforce that the waitforbytes parameter
+  * should be one. When multiple TCP streams are used between the client and the
+- * server, data might not be delivered in order. 
++ * server, data might not be delivered in order.
+  * globus_xio_data_descriptor_cntl() can be used to get the offset of the
+- * data. 
++ * data.
+  *
+- * globus_xio_register_write() does not enforce any restriction on the 
+- * waitforbytes parameter. 
++ * globus_xio_register_write() does not enforce any restriction on the
++ * waitforbytes parameter.
+  *
+  * In any case, when an error or EOF occurs before the waitforbytes request
+  * has been met, the outgoing nbytes is set to the amount of data actually
+@@ -74,11 +74,11 @@
+ 
+ /**
+  * @addtogroup globus_xio_gridftp_driver
+- * 
++ *
+  * @section globus_xio_gridftp_driver_env Environment Variables
+  *
+- * - GLOBUS_XIO_GRIDFTP_DEBUG Available if using a debug build. See 
+- * globus_debug.h for format. 
++ * - GLOBUS_XIO_GRIDFTP_DEBUG Available if using a debug build. See
++ * globus_debug.h for format.
+  */
+ 
+ /**
+@@ -100,11 +100,11 @@
+  * @addtogroup globus_xio_gridftp_driver
+  * @section globus_xio_gridftp_driver_types Types
+  *
+- * The errors reported by the GRIDFTP driver include GLOBUS_XIO_ERROR_EOF, 
+- * GLOBUS_XIO_ERROR_CANCELED, @ref GLOBUS_XIO_GRIDFTP_ERROR_OUTSTANDING_READ, 
+- * @ref GLOBUS_XIO_GRIDFTP_ERROR_SEEK, 
++ * The errors reported by the GRIDFTP driver include GLOBUS_XIO_ERROR_EOF,
++ * GLOBUS_XIO_ERROR_CANCELED, @ref GLOBUS_XIO_GRIDFTP_ERROR_OUTSTANDING_READ,
++ * @ref GLOBUS_XIO_GRIDFTP_ERROR_SEEK,
+  * @ref GLOBUS_XIO_GRIDFTP_ERROR_OUTSTANDING_WRITE,
+- * @ref GLOBUS_XIO_GRIDFTP_ERROR_PENDING_READ, 
++ * @ref GLOBUS_XIO_GRIDFTP_ERROR_PENDING_READ,
+  * @ref GLOBUS_XIO_GRIDFTP_ERROR_PENDING_WRITE,
+  * @ref GLOBUS_XIO_GRIDFTP_ERROR_OUTSTANDING_PARTIAL_XFER
+  *
+@@ -127,21 +127,21 @@ typedef enum
+      */
+     GLOBUS_XIO_GRIDFTP_ERROR_SEEK,
+     /**
+-     * Indicates that a write has been called while there is an outstanding 
++     * Indicates that a write has been called while there is an outstanding
+      * read
+      */
+     GLOBUS_XIO_GRIDFTP_ERROR_OUTSTANDING_READ,
+     /**
+-     * Indicates that a read has been called while there is an outstanding 
++     * Indicates that a read has been called while there is an outstanding
+      * write
+      */
+     GLOBUS_XIO_GRIDFTP_ERROR_OUTSTANDING_WRITE,
+     /**
+-     * Indicates that a write has been called while there is a read pending 
++     * Indicates that a write has been called while there is a read pending
+      */
+     GLOBUS_XIO_GRIDFTP_ERROR_PENDING_READ,
+     /**
+-     * Indicates that a read has been called while there is a write pending 
++     * Indicates that a read has been called while there is a write pending
+      */
+     GLOBUS_XIO_GRIDFTP_ERROR_PENDING_WRITE,
+     /**
+@@ -171,7 +171,7 @@ typedef enum
+ {
+     /*
+      * handle cntls
+-     */         
++     */
+ 
+     /** GlobusVarArgEnum(handle)
+      * Reposition the offset of the file being read/written.
+@@ -180,7 +180,7 @@ typedef enum
+      * @param seek_offset
+      *      Specifies the desired offset.
+      */
+-    /* globus_off_t			seek_offset */
++    /* globus_off_t                     seek_offset */
+     GLOBUS_XIO_GRIDFTP_SEEK,
+ 
+     /*
+@@ -195,7 +195,7 @@ typedef enum
+      *      Specifies the pointer to globus ftp client handle.
+      *      Note: this handle will not be destroyed.
+      */
+-    /* globus_ftp_client_handle_t *	ftp_handle */
++    /* globus_ftp_client_handle_t *     ftp_handle */
+     GLOBUS_XIO_GRIDFTP_SET_HANDLE,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -206,7 +206,7 @@ typedef enum
+      *      The ftp client handle pointer will be stored here. If none is set,
+      *      NULL will be set.
+      */
+-    /* globus_ftp_client_handle_t **	ftp_handle_out */
++    /* globus_ftp_client_handle_t **    ftp_handle_out */
+     GLOBUS_XIO_GRIDFTP_GET_HANDLE,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -216,7 +216,7 @@ typedef enum
+      * @param append
+      *      GLOBUS_TRUE to enable, GLOBUS_FALSE to disable (default).
+      */
+-    /* globus_bool_t			append */
++    /* globus_bool_t                    append */
+     GLOBUS_XIO_GRIDFTP_SET_APPEND,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -224,87 +224,87 @@ typedef enum
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param append_out
+-     *	    The append flag will be stored here.
++     *      The append flag will be stored here.
+      */
+-    /* globus_bool_t *			append_out */
++    /* globus_bool_t *                  append_out */
+     GLOBUS_XIO_GRIDFTP_GET_APPEND,
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set the ERET algorithm string. This string contains information needed
+-     * to invoke a server-specific data reduction algorithm on the file being 
++     * to invoke a server-specific data reduction algorithm on the file being
+      * retrieved.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param eret_alg_str
+      *      Specifies the ERET algorithm string.
+      */
+-    /* const char *			eret_alg_str */
++    /* const char *                     eret_alg_str */
+     GLOBUS_XIO_GRIDFTP_SET_ERET,
+ 
+     /** GlobusVarArgEnum(attr)
+-     * Get the ERET algorithm string. 
++     * Get the ERET algorithm string.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param eret_alg_str_out
+-     *      The ERET algorithm string will be stored here. It is the 
++     *      The ERET algorithm string will be stored here. It is the
+      * responsibility of the user to free the memory allocated for this string.
+      */
+-    /* char **				eret_alg_str_out */
++    /* char **                          eret_alg_str_out */
+     GLOBUS_XIO_GRIDFTP_GET_ERET,
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set the ESTO algorithm string. This string contains information needed
+-     * to invoke a server-specific data reduction algorithm on the file being 
++     * to invoke a server-specific data reduction algorithm on the file being
+      * stored.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param esto_alg_str
+      *      Specifies the ESTO algorithm string.
+      */
+-    /* const char *			esto_alg_str */
++    /* const char *                     esto_alg_str */
+     GLOBUS_XIO_GRIDFTP_SET_ESTO,
+ 
+     /** GlobusVarArgEnum(attr)
+-     * Get the ESTO algorithm string. 
++     * Get the ESTO algorithm string.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param esto_alg_str_out
+-     *      The ESTO algorithm string will be stored here. It is the 
++     *      The ESTO algorithm string will be stored here. It is the
+      * responsibility of the user to free the memory allocated for this string.
+      */
+-    /* char **				esto_alg_str_out */
++    /* char **                          esto_alg_str_out */
+     GLOBUS_XIO_GRIDFTP_GET_ESTO,
+ 
+     /** GlobusVarArgEnum(attr)
+-     * Enable or disable partial transfer (associate a transfer with each 
++     * Enable or disable partial transfer (associate a transfer with each
+      * read/write) on the GridFTP handle.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param partial_xfer
+      *      GLOBUS_TRUE to enable, GLOBUS_FALSE to disable (default).
+      */
+-    /* globus_bool_t			partial_xfer */
++    /* globus_bool_t                    partial_xfer */
+     GLOBUS_XIO_GRIDFTP_SET_PARTIAL_TRANSFER,
+ 
+     /** GlobusVarArgEnum(attr)
+-     * Get the partial transfer flag on the attr. 
++     * Get the partial transfer flag on the attr.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param partial_xfer_out
+      *      The partial xfer flag will be stored here.
+      */
+-    /* globus_bool_t *			partial_xfer_out */
++    /* globus_bool_t *                  partial_xfer_out */
+     GLOBUS_XIO_GRIDFTP_GET_PARTIAL_TRANSFER,
+ 
+     /** GlobusVarArgEnum(attr)
+-     * Set the number of TCP streams to be used between the client and the 
++     * Set the number of TCP streams to be used between the client and the
+      * server.
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param num_streams
+      *      Specifies the number of streams to use.
+      */
+-    /* int				num_streams */
++    /* int                              num_streams */
+     GLOBUS_XIO_GRIDFTP_SET_NUM_STREAMS,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -314,7 +314,7 @@ typedef enum
+      * @param num_streams_out
+      *      The stream count will be stored here.
+      */
+-    /* int *				num_streams_out */
++    /* int *                            num_streams_out */
+     GLOBUS_XIO_GRIDFTP_GET_NUM_STREAMS,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -322,10 +322,10 @@ typedef enum
+      * @ingroup gridftp_driver_cntls
+      *
+      * @param buf_size
+-     *      The send/recv buffer size in bytes to use. (default is system 
++     *      The send/recv buffer size in bytes to use. (default is system
+      *      specific)
+      */
+-    /* int				buf_size */
++    /* int                              buf_size */
+     GLOBUS_XIO_GRIDFTP_SET_TCP_BUFFER,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -335,7 +335,7 @@ typedef enum
+      * @param buf_size_out
+      *      The send/recv buffer size will be stored here.
+      */
+-    /* int *				buf_size_out */
++    /* int *                            buf_size_out */
+     GLOBUS_XIO_GRIDFTP_GET_TCP_BUFFER,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -344,10 +344,10 @@ typedef enum
+      *
+      * @param mode
+      *      Specifies the data transmission mode. (default is stream mode)
+-     * 
++     *
+      * @see globus_l_xio_gridftp_mode_t
+      */
+-    /* int				mode */
++    /* int                              mode */
+     GLOBUS_XIO_GRIDFTP_SET_MODE,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -358,8 +358,8 @@ typedef enum
+      *      The data transmission mode will be stored here.
+      *
+      * @see globus_l_xio_gridftp_mode_t
+-     */  
+-    /* int *				mode_out */
++     */
++    /* int *                            mode_out */
+     GLOBUS_XIO_GRIDFTP_GET_MODE,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -371,25 +371,25 @@ typedef enum
+      *      The credential to use for authenticating with a GridFTP server.
+      *      This may be GSS_C_NO_CREDENTIAL to use the default credential.
+      * @param user
+-     *      The user name to send to the GridFTP server. When doing a GSI 
+-     *      transfer, this may be set to NULL, and the default gridmap entry 
++     *      The user name to send to the GridFTP server. When doing a GSI
++     *      transfer, this may be set to NULL, and the default gridmap entry
+      *      for the user's GSI identity will be used
+      * @param password
+-     *      The password to send to the GridFTP server. When doing a GSI 
+-     *      transfer, this may be set to NULL. 
++     *      The password to send to the GridFTP server. When doing a GSI
++     *      transfer, this may be set to NULL.
+      * @param account
+      *      The account to use for the data transfer.
+      * @param subject
+-     *      The subject name of the GridFTP server. This is only used when 
+-     *      doing a GSI transfer, and then only when the security subject 
++     *      The subject name of the GridFTP server. This is only used when
++     *      doing a GSI transfer, and then only when the security subject
+      *      name does not match the hostname of the server (ie, when the server
+-     *      is being run by a user). 
++     *      is being run by a user).
+      */
+-    /* gss_cred_id_t			credential,
+-     * const char *			user,
+-     * const char *			password,
+-     * const char *			account,
+-     * const char *			subject */
++    /* gss_cred_id_t                    credential,
++     * const char *                     user,
++     * const char *                     password,
++     * const char *                     account,
++     * const char *                     subject */
+     GLOBUS_XIO_GRIDFTP_SET_AUTH,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -407,7 +407,7 @@ typedef enum
+      * @param subject_out
+      *      The subject name will be stored here.
+      */
+-    /* gss_cred_id_t *			credential_out,
++    /* gss_cred_id_t *                  credential_out,
+      * const char **                    user_out,
+      * const char **                    password_out,
+      * const char **                    account_out,
+@@ -423,7 +423,7 @@ typedef enum
+      *
+      * @see globus_l_xio_gridftp_dcau_mode_t
+      */
+-    /* int				dcau_mode */
++    /* int                              dcau_mode */
+     GLOBUS_XIO_GRIDFTP_SET_DCAU,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -435,7 +435,7 @@ typedef enum
+      *
+      * @see globus_l_xio_gridftp_dcau_mode_t
+      */
+-    /* int *				dcau_mode_out */
++    /* int *                            dcau_mode_out */
+     GLOBUS_XIO_GRIDFTP_GET_DCAU,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -447,7 +447,7 @@ typedef enum
+      *
+      * @see globus_l_xio_gridftp_protection_t
+      */
+-    /* int				protection */
++    /* int                              protection */
+     GLOBUS_XIO_GRIDFTP_SET_DATA_PROTECTION,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -459,7 +459,7 @@ typedef enum
+      *
+      * @see globus_l_xio_gridftp_dcau_mode_t
+      */
+-    /* int *				protection_out */
++    /* int *                            protection_out */
+     GLOBUS_XIO_GRIDFTP_GET_DATA_PROTECTION,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -471,7 +471,7 @@ typedef enum
+      *
+      * @see globus_l_xio_gridftp_protection_t
+      */
+-    /* int				protection */
++    /* int                              protection */
+     GLOBUS_XIO_GRIDFTP_SET_CONTROL_PROTECTION,
+ 
+     /** GlobusVarArgEnum(attr)
+@@ -483,16 +483,16 @@ typedef enum
+      *
+      * @see globus_l_xio_gridftp_protection_t
+      */
+-    /* int *				protection_out */
++    /* int *                            protection_out */
+     GLOBUS_XIO_GRIDFTP_GET_CONTROL_PROTECTION
+ 
+-} globus_xio_gridftp_cmd_t;     
++} globus_xio_gridftp_cmd_t;
+ 
+-/**  
++/**
+  * GRIDFTP driver specific types
+  * @ingroup globus_xio_gridftp_driver
+  * @hideinitializer
+- */  
++ */
+ 
+ typedef enum globus_l_xio_gridftp_mode_e
+ {
+diff --git a/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c b/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c
+index f1da8da2f..74a7dea01 100644
+--- a/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c
++++ b/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c
+@@ -45,7 +45,7 @@ _test_res(
+ void
+ help()
+ {
+-    fprintf(stdout, 
++    fprintf(stdout,
+         "globus-xio-gridftp [options]\n"
+         "-----------------\n"
+         "specify -c <contact string> to communicate with the server"
+@@ -98,7 +98,7 @@ main(
+             {
+                 cs = argv[++ctr];
+             }
+-            else        
++            else
+             {
+                 help();
+                 exit(1);
+@@ -110,7 +110,7 @@ main(
+             {
+                 filename =  argv[++ctr];
+             }
+-            else        
++            else
+             {
+                 help();
+                 exit(1);
+@@ -119,7 +119,7 @@ main(
+         else if(strcmp(argv[ctr], "-r") == 0)
+         {
+             read = GLOBUS_TRUE;
+-        }       
++        }
+         else if(strcmp(argv[ctr], "-w") == 0)
+         {
+             read = GLOBUS_FALSE;
+@@ -172,8 +172,8 @@ main(
+     test_res(res);
+     res = globus_xio_stack_push_driver(stack, gridftp_driver);
+     test_res(res);
+-    
+-  
++
++
+     res = globus_xio_handle_create(&xio_handle, stack);
+     test_res(res);
+     res = globus_xio_stack_destroy(stack);
+@@ -188,13 +188,13 @@ main(
+     }
+     if (partial_xfer)
+     {
+-        res = globus_xio_attr_cntl(attr, gridftp_driver, 
++        res = globus_xio_attr_cntl(attr, gridftp_driver,
+             GLOBUS_XIO_GRIDFTP_SET_PARTIAL_TRANSFER, GLOBUS_TRUE);
+         test_res(res);
+     }
+     if (append)
+     {
+-        res = globus_xio_attr_cntl(attr, gridftp_driver, 
++        res = globus_xio_attr_cntl(attr, gridftp_driver,
+             GLOBUS_XIO_GRIDFTP_SET_APPEND, GLOBUS_TRUE);
+         test_res(res);
+     }
+@@ -202,12 +202,12 @@ main(
+     {
+         if (read)
+         {
+-            res = globus_xio_attr_cntl(attr, gridftp_driver, 
++            res = globus_xio_attr_cntl(attr, gridftp_driver,
+                 GLOBUS_XIO_GRIDFTP_SET_ERET, eret_esto_alg_str);
+         }
+         else
+         {
+-            res = globus_xio_attr_cntl(attr, gridftp_driver, 
++            res = globus_xio_attr_cntl(attr, gridftp_driver,
+                 GLOBUS_XIO_GRIDFTP_SET_ESTO, eret_esto_alg_str);
+         }
+         test_res(res);
+@@ -251,17 +251,17 @@ main(
+                 nbytes,
+                 &nbytes,
+                 NULL);
+-            test_res(res); 
++            test_res(res);
+             if (seek)
+             {
+                 j += 2*nbytes;
+                 res = globus_xio_handle_cntl(xio_handle, gridftp_driver,
+                     GLOBUS_XIO_GRIDFTP_SEEK, j);
+-                test_res(res); 
++                test_res(res);
+             }
+-        } 
+-        fclose(fp);  
+-        
++        }
++        fclose(fp);
++
+     }
+     else
+     {
+@@ -293,7 +293,7 @@ main(
+                     j += 2*nbytes;
+                     res = globus_xio_handle_cntl(xio_handle, gridftp_driver,
+                         GLOBUS_XIO_GRIDFTP_SEEK, j);
+-                    test_res(res); 
++                    test_res(res);
+                 }
+             }
+             else
+@@ -309,11 +309,11 @@ main(
+ 
+     if (user_handle)
+     {
+-        globus_ftp_client_handle_destroy(&ftp_handle);  
++        globus_ftp_client_handle_destroy(&ftp_handle);
+     }
+     res = globus_xio_driver_unload(gridftp_driver);
+     test_res(res);
+- 
++
+     rc = globus_module_deactivate(GLOBUS_XIO_MODULE);
+     globus_assert(rc == GLOBUS_SUCCESS);
+     return 0;
+-- 
+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..16957e6
--- /dev/null
+++ b/0002-Fix-compiler-and-doxygen-warnings.patch
@@ -0,0 +1,264 @@
+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_xio_gridftp_driver.h        | 50 +++++++++----------
+ .../source/test/globus_gridftp_driver_test.c  |  4 +-
+ 2 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h b/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h
+index 68e397fbd..f04fc44cd 100644
+--- a/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h
++++ b/gridftp/gridftp_driver/source/globus_xio_gridftp_driver.h
+@@ -175,7 +175,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(handle)
+      * Reposition the offset of the file being read/written.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param seek_offset
+      *      Specifies the desired offset.
+@@ -188,7 +188,7 @@ typedef enum
+      */
+     /** GlobusVarArgEnum(attr)
+      * Set the ftp client handle to use.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      * Do not create a new ftp client handle, use this handle instead.
+      *
+      * @param ftp_handle
+@@ -200,7 +200,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the ftp client handle on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param ftp_handle_out
+      *      The ftp client handle pointer will be stored here. If none is set,
+@@ -211,7 +211,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Enable or disable opening the file in append mode.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param append
+      *      GLOBUS_TRUE to enable, GLOBUS_FALSE to disable (default).
+@@ -221,7 +221,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the append flag on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param append_out
+      *      The append flag will be stored here.
+@@ -233,7 +233,7 @@ typedef enum
+      * Set the ERET algorithm string. This string contains information needed
+      * to invoke a server-specific data reduction algorithm on the file being
+      * retrieved.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param eret_alg_str
+      *      Specifies the ERET algorithm string.
+@@ -243,7 +243,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the ERET algorithm string.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param eret_alg_str_out
+      *      The ERET algorithm string will be stored here. It is the
+@@ -256,7 +256,7 @@ typedef enum
+      * Set the ESTO algorithm string. This string contains information needed
+      * to invoke a server-specific data reduction algorithm on the file being
+      * stored.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param esto_alg_str
+      *      Specifies the ESTO algorithm string.
+@@ -266,7 +266,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the ESTO algorithm string.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param esto_alg_str_out
+      *      The ESTO algorithm string will be stored here. It is the
+@@ -278,7 +278,7 @@ typedef enum
+     /** GlobusVarArgEnum(attr)
+      * Enable or disable partial transfer (associate a transfer with each
+      * read/write) on the GridFTP handle.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param partial_xfer
+      *      GLOBUS_TRUE to enable, GLOBUS_FALSE to disable (default).
+@@ -288,7 +288,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the partial transfer flag on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param partial_xfer_out
+      *      The partial xfer flag will be stored here.
+@@ -299,7 +299,7 @@ typedef enum
+     /** GlobusVarArgEnum(attr)
+      * Set the number of TCP streams to be used between the client and the
+      * server.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param num_streams
+      *      Specifies the number of streams to use.
+@@ -309,7 +309,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the number of TCP streams on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param num_streams_out
+      *      The stream count will be stored here.
+@@ -319,7 +319,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set the TCP socket send/recv buffer size.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param buf_size
+      *      The send/recv buffer size in bytes to use. (default is system
+@@ -330,7 +330,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the TCP socket send/recv buffer size on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param buf_size_out
+      *      The send/recv buffer size will be stored here.
+@@ -340,7 +340,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set the transmission mode used for data transfer
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param mode
+      *      Specifies the data transmission mode. (default is stream mode)
+@@ -352,7 +352,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the data transmission mode on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param mode_out
+      *      The data transmission mode will be stored here.
+@@ -365,7 +365,7 @@ typedef enum
+     /** GlobusVarArgEnum(attr)
+      * Set the authentication information used to authenticate with the GridFTP
+      * server
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param credential
+      *      The credential to use for authenticating with a GridFTP server.
+@@ -394,7 +394,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the authentication information on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param credential_out
+      *      The credential will be stored here.
+@@ -416,7 +416,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set the mode of authentication to be performed on GridFTP data channels.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param dcau_mode
+      *      Specifies the authentication mode.
+@@ -428,7 +428,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the data channel authentication mode on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param dcau_mode_out
+      *      The data channel authentication mode will be stored here.
+@@ -440,7 +440,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set protection level on the data channel.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param protection
+      *      Specifies the protection level.
+@@ -452,7 +452,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the data channel protection level on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param protection_out
+      *      The data channel protection level will be stored here.
+@@ -464,7 +464,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Set protection level on the control channel.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param protection
+      *      Specifies the protection level.
+@@ -476,7 +476,7 @@ typedef enum
+ 
+     /** GlobusVarArgEnum(attr)
+      * Get the control channel protection level on the attr.
+-     * @ingroup gridftp_driver_cntls
++     * @ingroup globus_xio_gridftp_driver
+      *
+      * @param protection_out
+      *      The control channel protection level will be stored here.
+diff --git a/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c b/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c
+index 74a7dea01..63f26a64d 100644
+--- a/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c
++++ b/gridftp/gridftp_driver/source/test/globus_gridftp_driver_test.c
+@@ -231,7 +231,7 @@ main(
+     {
+         globus_byte_t                   buffer[CHUNK_SIZE + 1];
+         size_t                          nbytes;
+-        int i, x, j = 0;
++        int i, j = 0;
+         fp = fopen(filename, "r");
+         if (fp == NULL)
+         {
+@@ -242,7 +242,7 @@ main(
+         {
+             for (i = 0; i< CHUNK_SIZE + 1; i++)
+                 buffer[i] = '\0';
+-            x = fread(buffer, CHUNK_SIZE, 1, fp);
++            fread(buffer, CHUNK_SIZE, 1, fp);
+             nbytes = strlen((char *) buffer);
+             res = globus_xio_write(
+                 xio_handle,
+-- 
+2.54.0
+

diff --git a/globus-xio-gridftp-driver.spec b/globus-xio-gridftp-driver.spec
index 29b0a8b..c721757 100644
--- a/globus-xio-gridftp-driver.spec
+++ b/globus-xio-gridftp-driver.spec
@@ -1,13 +1,15 @@
 Name:		globus-xio-gridftp-driver
 %global _name %(tr - _ <<< %{name})
 Version:	3.6
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Grid Community Toolkit - Globus XIO GridFTP 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
@@ -76,6 +78,8 @@ Globus XIO GridFTP Driver Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch -P0 -p4
+%patch -P1 -p4
 
 %build
 # Reduce overlinking
@@ -127,6 +131,9 @@ GLOBUS_HOSTNAME=localhost %make_build check
 %license GLOBUS_LICENSE
 
 %changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.6-11
+- Fix compiler and doxygen warnings
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-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:54 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:54 [rpms/globus-xio-gridftp-driver] rawhide: Fix compiler and doxygen 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