From cf40c01b45626fb53be536570e4ece12d83fa656 Mon Sep 17 00:00:00 2001 From: tg Date: Thu, 31 Oct 2013 20:05:39 +0000 Subject: [PATCH] =?UTF-8?q?adapt=20most=20=5F=5Fattribute=5F=5F((=E2=80=A6?= =?UTF-8?q?))=20occurrences=20to=20new=20KNF=20style(9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build.sh | 10 +++++----- sh.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Build.sh b/Build.sh index 54e1615..2be2b06 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.647 2013/09/10 17:32:56 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.648 2013/10/31 20:05:38 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013 @@ -1356,8 +1356,8 @@ ac_test attribute_bounded '' 'for __attribute__((__bounded__))' <<-'EOF' #include #undef __attribute__ int xcopy(const void *, void *, size_t) - __attribute__((__bounded__ (__buffer__, 1, 3))) - __attribute__((__bounded__ (__buffer__, 2, 3))); + __attribute__((__bounded__(__buffer__, 1, 3))) + __attribute__((__bounded__(__buffer__, 2, 3))); int main(int ac, char *av[]) { return (xcopy(av[0], av[--ac], 1)); } int xcopy(const void *s, void *d, size_t n) { /* @@ -1379,7 +1379,7 @@ ac_test attribute_format '' 'for __attribute__((__format__))' <<-'EOF' #undef __attribute__ #undef fprintf extern int fprintf(FILE *, const char *format, ...) - __attribute__((__format__ (__printf__, 2, 3))); + __attribute__((__format__(__printf__, 2, 3))); int main(int ac, char **av) { return (fprintf(stderr, "%s%d", *av, ac)); } #endif EOF @@ -1598,7 +1598,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.647 2013/09/10 17:32:56 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.648 2013/10/31 20:05:38 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (0); } EOF case $cm in diff --git a/sh.h b/sh.h index d184059..f9f9e47 100644 --- a/sh.h +++ b/sh.h @@ -108,12 +108,12 @@ #undef __attribute__ #if HAVE_ATTRIBUTE_BOUNDED -#define MKSH_A_BOUNDED(x,y,z) __attribute__((__bounded__ (x, y, z))) +#define MKSH_A_BOUNDED(x,y,z) __attribute__((__bounded__(x, y, z))) #else #define MKSH_A_BOUNDED(x,y,z) /* nothing */ #endif #if HAVE_ATTRIBUTE_FORMAT -#define MKSH_A_FORMAT(x,y,z) __attribute__((__format__ (x, y, z))) +#define MKSH_A_FORMAT(x,y,z) __attribute__((__format__(x, y, z))) #else #define MKSH_A_FORMAT(x,y,z) /* nothing */ #endif @@ -164,7 +164,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.672 2013/10/09 11:59:29 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.673 2013/10/31 20:05:39 tg Exp $"); #endif #define MKSH_VERSION "R48 2013/10/08"