diff options
| author | maximilian attems | 2011-07-31 12:47:19 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-08-02 13:58:24 +0200 |
| commit | 4b2b671697ecaed60ccd98dcc16f6ab374423185 (patch) | |
| tree | 889edc8cdc9256324a3625e589001e6ca0f1f9ab /include/c.h | |
| parent | pg: fix compiler warnings [-Wunused-result] (diff) | |
| download | kernel-qcow2-util-linux-4b2b671697ecaed60ccd98dcc16f6ab374423185.tar.gz kernel-qcow2-util-linux-4b2b671697ecaed60ccd98dcc16f6ab374423185.tar.xz kernel-qcow2-util-linux-4b2b671697ecaed60ccd98dcc16f6ab374423185.zip | |
include: [c.h] move up declaration of program_invocation_short_name before usage
fixes:
../include/c.h: In function ‘errmsg’:
../include/c.h:111:26: error: ‘program_invocation_short_name’ undeclared
(first use in this function)
../include/c.h:111:26: note: each undeclared identifier is reported only
once for each function it appears in
Signed-off-by: maximilian attems <max@stro.at>
Diffstat (limited to 'include/c.h')
| -rw-r--r-- | include/c.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/include/c.h b/include/c.h index 70f403c2b..79581aeb4 100644 --- a/include/c.h +++ b/include/c.h @@ -103,6 +103,41 @@ _max1 > _max2 ? _max1 : _max2; }) #endif +#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME +# ifdef HAVE___PROGNAME +extern char *__progname; +# define program_invocation_short_name __progname +# else +# ifdef HAVE_GETEXECNAME +# include <stdlib.h> +# define program_invocation_short_name \ + prog_inv_sh_nm_from_file(getexecname(), 0) +# else +# define program_invocation_short_name \ + prog_inv_sh_nm_from_file(__FILE__, 1) +# endif +static char prog_inv_sh_nm_buf[256]; +static inline char * +prog_inv_sh_nm_from_file(char *f, char stripext) +{ + char *t; + + if ((t = strrchr(f, '/')) != NULL) + t++; + else + t = f; + + strncpy(prog_inv_sh_nm_buf, t, sizeof(prog_inv_sh_nm_buf) - 1); + prog_inv_sh_nm_buf[sizeof(prog_inv_sh_nm_buf) - 1] = '\0'; + + if (stripext && (t = strrchr(prog_inv_sh_nm_buf, '.')) != NULL) + *t = '\0'; + + return prog_inv_sh_nm_buf; +} +# endif +#endif + #ifndef HAVE_ERR_H static inline void @@ -160,41 +195,6 @@ static inline int dirfd(DIR *d) } #endif -#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME -# ifdef HAVE___PROGNAME -extern char *__progname; -# define program_invocation_short_name __progname -# else -# ifdef HAVE_GETEXECNAME -# include <stdlib.h> -# define program_invocation_short_name \ - prog_inv_sh_nm_from_file(getexecname(), 0) -# else -# define program_invocation_short_name \ - prog_inv_sh_nm_from_file(__FILE__, 1) -# endif -static char prog_inv_sh_nm_buf[256]; -static inline char * -prog_inv_sh_nm_from_file(char *f, char stripext) -{ - char *t; - - if ((t = strrchr(f, '/')) != NULL) - t++; - else - t = f; - - strncpy(prog_inv_sh_nm_buf, t, sizeof(prog_inv_sh_nm_buf) - 1); - prog_inv_sh_nm_buf[sizeof(prog_inv_sh_nm_buf) - 1] = '\0'; - - if (stripext && (t = strrchr(prog_inv_sh_nm_buf, '.')) != NULL) - *t = '\0'; - - return prog_inv_sh_nm_buf; -} -# endif -#endif - /* * Fallback defines for old versions of glibc */ |