From 87783e25137b4159dd846bf645aa907371615e8c Mon Sep 17 00:00:00 2001 From: Frederik Seiffert Date: Thu, 11 Nov 2021 16:41:50 +0100 Subject: [PATCH] Annotate NSBundle localized string function with NS_FORMAT_ARGUMENT. --- ChangeLog | 5 +++++ Headers/Foundation/NSBundle.h | 2 +- Headers/GNUstepBase/GSVersionMacros.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9daa0a5a..7a7ba552c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-11-11 Frederik Seiffert + + * Headers/Foundation/NSBundle.h: + Annotate NSBundle localized string function with NS_FORMAT_ARGUMENT. + 2021-09-20 Frederik Seiffert * Source/NSFileManager.m: diff --git a/Headers/Foundation/NSBundle.h b/Headers/Foundation/NSBundle.h index 2a6fc418a..2a41807ba 100644 --- a/Headers/Foundation/NSBundle.h +++ b/Headers/Foundation/NSBundle.h @@ -345,7 +345,7 @@ GS_EXPORT_CLASS */ - (NSString*) localizedStringForKey: (NSString*)key value: (NSString*)value - table: (NSString*)tableName; + table: (NSString*)tableName NS_FORMAT_ARGUMENT(1); /** Returns the absolute path to the resources directory of the bundle. */ - (NSString*) resourcePath; diff --git a/Headers/GNUstepBase/GSVersionMacros.h b/Headers/GNUstepBase/GSVersionMacros.h index 89bf45c92..d225b30d8 100644 --- a/Headers/GNUstepBase/GSVersionMacros.h +++ b/Headers/GNUstepBase/GSVersionMacros.h @@ -423,7 +423,7 @@ static inline void gs_consumed(id NS_CONSUMED GS_UNUSED_ARG o) { return; } #if defined(__clang__) || GS_GCC_MINREQ(4,2) # define NS_FORMAT_ARGUMENT(A) __attribute__((format_arg(A))) #else -# define NS_FORMAT_ARGUMENT(F,A) +# define NS_FORMAT_ARGUMENT(A) #endif #endif