mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tar: port wordsplit attribute to Sun C

Browse Source 
Reported by Ted Carr in:
http://lists.gnu.org/archive/html/bug-tar/2015-01/msg00002.html
* lib/wordsplit.h (__WORDSPLIT_ATTRIBUTE_FORMAT):
New macro, taken from Gnulib.
(struct wordsplit): Use it.
* lib/wordsplit.c (_wsplt_error): Use it.
This commit is contained in:
Paul Eggert
2015-01-05 20:07:34 -08:00
parent 5a9ac8312e
commit 55fb2fc38f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wordsplit.c
View File

@@ -61,7 +61,7 @@ _wsplt_alloc_die (struct wordsplit *wsp)
abort (); abort ();
} }
static void __attribute__ ((__format__ (__printf__, 1, 2))) static void __WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2))
_wsplt_error (const char *fmt, ...) _wsplt_error (const char *fmt, ...)
{ {
va_list ap; va_list ap;

10
lib/wordsplit.h
View File

@@ -22,6 +22,12 @@
#include <stddef.h> #include <stddef.h>
#if 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
#else
# define __WORDSPLIT_ATTRIBUTE_FORMAT(spec) /* empty */
#endif
struct wordsplit struct wordsplit
{ {
size_t ws_wordc; size_t ws_wordc;
@@ -34,9 +40,9 @@ struct wordsplit
const char *ws_escape; const char *ws_escape;
void (*ws_alloc_die) (struct wordsplit * wsp); void (*ws_alloc_die) (struct wordsplit * wsp);
void (*ws_error) (const char *, ...) void (*ws_error) (const char *, ...)
__attribute__ ((__format__ (__printf__, 1, 2))); __WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
void (*ws_debug) (const char *, ...) void (*ws_debug) (const char *, ...)
__attribute__ ((__format__ (__printf__, 1, 2))); __WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
const char **ws_env; const char **ws_env;
const char *(*ws_getvar) (const char *, size_t, void *); const char *(*ws_getvar) (const char *, size_t, void *);