diff options
author | Wayne Davison <wayned@samba.org> | 2004-05-08 22:49:58 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2004-05-08 22:49:58 +0000 |
commit | a43e21e05c5cf9e3525b3dd5480e4ee5945ffab1 (patch) | |
tree | d501c3a778fd0d0c9a731083e7bf0cc490dc1407 /popt | |
parent | 4135d091a6751f6b209a8600720ab6ec183cd909 (diff) | |
download | rsync-a43e21e05c5cf9e3525b3dd5480e4ee5945ffab1.tar.gz |
Let's just remove all the UNUSED() macros for now.
Diffstat (limited to 'popt')
-rw-r--r-- | popt/popt.c | 2 | ||||
-rw-r--r-- | popt/poptconfig.c | 2 | ||||
-rw-r--r-- | popt/popthelp.c | 12 | ||||
-rw-r--r-- | popt/system.h | 10 |
4 files changed, 8 insertions, 18 deletions
diff --git a/popt/popt.c b/popt/popt.c index a629bee6..a75086d1 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -1055,7 +1055,7 @@ poptContext poptFreeContext(poptContext con) } int poptAddAlias(poptContext con, struct poptAlias alias, - UNUSED(int flags)) + /*@unused@*/ int flags) { poptItem item = (poptItem) alloca(sizeof(*item)); memset(item, 0, sizeof(*item)); diff --git a/popt/poptconfig.c b/popt/poptconfig.c index 50235661..177e9724 100644 --- a/popt/poptconfig.c +++ b/popt/poptconfig.c @@ -159,7 +159,7 @@ int poptReadConfigFile(poptContext con, const char * fn) return 0; } -int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv)) +int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) { char * fn, * home; int rc; diff --git a/popt/popthelp.c b/popt/popthelp.c index 9b092053..1ddb895c 100644 --- a/popt/popthelp.c +++ b/popt/popthelp.c @@ -17,9 +17,9 @@ * @param key option(s) */ static void displayArgs(poptContext con, - /*@unused@*/ UNUSED(enum poptCallbackReason foo), + /*@unused@*/ enum poptCallbackReason foo, struct poptOption * key, - /*@unused@*/ UNUSED(const char * arg), /*@unused@*/ UNUSED(void * data)) + /*@unused@*/ const char * arg, /*@unused@*/ void * data) /*@globals fileSystem@*/ /*@modifies fileSystem@*/ { @@ -84,7 +84,7 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *table) /*@observer@*/ /*@null@*/ static const char *const getArgDescrip(const struct poptOption * opt, /*@-paramuse@*/ /* FIX: wazzup? */ - /*@null@*/ UNUSED(const char * translation_domain)) + /*@null@*/ const char * translation_domain) /*@=paramuse@*/ /*@*/ { @@ -115,7 +115,7 @@ static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength, const struct poptOption * opt, /*@-paramuse@*/ /* FIX: i18n macros disable with lclint */ - /*@null@*/ UNUSED(const char * translation_domain)) + /*@null@*/ const char * translation_domain) /*@=paramuse@*/ /*@*/ { @@ -475,7 +475,7 @@ static int showHelpIntro(poptContext con, FILE * fp) return len; } -void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags)) +void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags) { int leftColWidth; @@ -634,7 +634,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp, return strlen(s) + 4; } -void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags)) +void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags) { int cursor; diff --git a/popt/system.h b/popt/system.h index 02f05c18..fc2f0d4c 100644 --- a/popt/system.h +++ b/popt/system.h @@ -19,14 +19,6 @@ #include <unistd.h> #endif -#if !defined(__GNUC__) || defined(APPLE) -/* Apparently the OS X port of gcc gags on __attribute__. - * - * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */ -#define __attribute__(x) - -#endif - #ifdef __NeXT /* access macros are not declared in non posix mode in unistd.h - don't try to use posix on NeXTstep 3.3 ! */ @@ -77,6 +69,4 @@ char *alloca (); #define xstrdup(_str) strdup(_str) #endif /* HAVE_MCHECK_H && defined(__GNUC__) */ -#define UNUSED(x) x __attribute__((__unused__)) - #include "popt.h" |