From c41919368c480c3cf6c9759ad4b7c26a03e7a6fa Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Wed, 27 Mar 2024 14:12:35 -0400 Subject: [PATCH] squash. formatting --- lib/api/include/irods/generalUpdate.h | 3 ++- lib/core/include/irods/rodsGeneralUpdate.h | 3 ++- server/api/include/irods/rsGeneralUpdate.hpp | 3 ++- server/icat/include/irods/icatHighLevelRoutines.hpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/api/include/irods/generalUpdate.h b/lib/api/include/irods/generalUpdate.h index 62d021fdfc..bf966870bc 100644 --- a/lib/api/include/irods/generalUpdate.h +++ b/lib/api/include/irods/generalUpdate.h @@ -8,7 +8,8 @@ extern "C" { #endif -__attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))) int rcGeneralUpdate(rcComm_t* conn, generalUpdateInp_t* generalUpdateInp); +int rcGeneralUpdate(rcComm_t* conn, generalUpdateInp_t* generalUpdateInp) + __attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))); #ifdef __cplusplus } // extern "C" diff --git a/lib/core/include/irods/rodsGeneralUpdate.h b/lib/core/include/irods/rodsGeneralUpdate.h index 28b3b75028..81560fa7bb 100644 --- a/lib/core/include/irods/rodsGeneralUpdate.h +++ b/lib/core/include/irods/rodsGeneralUpdate.h @@ -26,7 +26,8 @@ #define GeneralUpdateInp_PI "int type; struct InxValPair_PI;" // NOLINTNEXTLINE(modernize-use-using) -__attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))) typedef struct __attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))) GeneralUpdateInp +__attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))) typedef struct __attribute__(( + deprecated("GeneralUpdate is deprecated. Its use should be avoided."))) GeneralUpdateInp { int type; /* GEN_UPDATE_INSERT or DELETE */ inxValPair_t values; /* Column IDs (from rodsGenQuery.h) and values */ diff --git a/server/api/include/irods/rsGeneralUpdate.hpp b/server/api/include/irods/rsGeneralUpdate.hpp index 980abfc498..527b17b381 100644 --- a/server/api/include/irods/rsGeneralUpdate.hpp +++ b/server/api/include/irods/rsGeneralUpdate.hpp @@ -4,7 +4,8 @@ #include "irods/rcConnect.h" #include "irods/rodsGeneralUpdate.h" -[[deprecated("GeneralUpdate is deprecated. Its use should be avoided.")]] int rsGeneralUpdate(rsComm_t* rsComm, generalUpdateInp_t* generalUpdateInp); +int rsGeneralUpdate(rsComm_t* rsComm, generalUpdateInp_t* generalUpdateInp) + __attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))); #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" diff --git a/server/icat/include/irods/icatHighLevelRoutines.hpp b/server/icat/include/irods/icatHighLevelRoutines.hpp index ece93071ab..560dea211f 100644 --- a/server/icat/include/irods/icatHighLevelRoutines.hpp +++ b/server/icat/include/irods/icatHighLevelRoutines.hpp @@ -61,7 +61,8 @@ int chlGenQueryTicketSetup( const char *ticket, const char *clientAddr ); int chlSpecificQuery( specificQueryInp_t specificQueryInp, genQueryOut_t *genQueryOut ); -__attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))) int chlGeneralUpdate(generalUpdateInp_t generalUpdateInp); +int chlGeneralUpdate(generalUpdateInp_t generalUpdateInp) + __attribute__((deprecated("GeneralUpdate is deprecated. Its use should be avoided."))); int chlDelCollByAdmin( rsComm_t *rsComm, collInfo_t *collInfo ); int chlDelColl( rsComm_t *rsComm, collInfo_t *collInfo );