ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

include/xalloc: use multiline function declarations 

There are two things happening in this commit.  1) Move each function
attribute to it's own line 2) move function return value after attributes so
that function inputs and outputs are on same line.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2019-08-18 11:03:44 +01:00 committed by Karel Zak
parent ff9da8efca
commit aba9e76e25
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/xalloc.h
View File

@ -19,15 +19,18 @@
# define XALLOC_EXIT_CODE EXIT_FAILURE # define XALLOC_EXIT_CODE EXIT_FAILURE
#endif #endif
static inline void __attribute__((__noreturn__)) static inline
__err_oom(const char *file, unsigned int line) __attribute__((__noreturn__))
void __err_oom(const char *file, unsigned int line)
{ {
err(XALLOC_EXIT_CODE, "%s: %u: cannot allocate memory", file, line); err(XALLOC_EXIT_CODE, "%s: %u: cannot allocate memory", file, line);
} }
#define err_oom() __err_oom(__FILE__, __LINE__) #define err_oom() __err_oom(__FILE__, __LINE__)
static inline __ul_alloc_size(1) __ul_returns_nonnull static inline
__ul_alloc_size(1)
__ul_returns_nonnull
void *xmalloc(const size_t size) void *xmalloc(const size_t size)
{ {
void *ret = malloc(size); void *ret = malloc(size);
@ -37,7 +40,9 @@ void *xmalloc(const size_t size)
return ret; return ret;
} }
static inline __ul_alloc_size(2) __ul_returns_nonnull static inline
__ul_alloc_size(2)
__ul_returns_nonnull
void *xrealloc(void *ptr, const size_t size) void *xrealloc(void *ptr, const size_t size)
{ {
void *ret = realloc(ptr, size); void *ret = realloc(ptr, size);
@ -47,7 +52,9 @@ void *xrealloc(void *ptr, const size_t size)
return ret; return ret;
} }
static inline __ul_calloc_size(1, 2) __ul_returns_nonnull static inline
__ul_calloc_size(1, 2)
__ul_returns_nonnull
void *xcalloc(const size_t nelems, const size_t size) void *xcalloc(const size_t nelems, const size_t size)
{ {
void *ret = calloc(nelems, size); void *ret = calloc(nelems, size);
@ -57,8 +64,10 @@ void *xcalloc(const size_t nelems, const size_t size)
return ret; return ret;
} }
static inline char __attribute__((warn_unused_result)) __ul_returns_nonnull static inline
*xstrdup(const char *str) __attribute__((warn_unused_result))
__ul_returns_nonnull
char *xstrdup(const char *str)
{ {
char *ret; char *ret;
@ -71,8 +80,10 @@ static inline char __attribute__((warn_unused_result)) __ul_returns_nonnull
return ret; return ret;
} }
static inline char * __attribute__((warn_unused_result)) __ul_returns_nonnull static inline
xstrndup(const char *str, size_t size) __attribute__((warn_unused_result))
__ul_returns_nonnull
char *xstrndup(const char *str, size_t size)
{ {
char *ret; char *ret;
@ -86,8 +97,9 @@ xstrndup(const char *str, size_t size)
} }
static inline int __attribute__ ((__format__(printf, 2, 3))) static inline
xasprintf(char **strp, const char *fmt, ...) __attribute__((__format__(printf, 2, 3)))
int xasprintf(char **strp, const char *fmt, ...)
{ {
int ret; int ret;
va_list args; va_list args;
@ -99,8 +111,9 @@ static inline int __attribute__ ((__format__(printf, 2, 3)))
return ret; return ret;
} }
static inline int __attribute__ ((__format__(printf, 2, 0))) static inline
xvasprintf(char **strp, const char *fmt, va_list ap) __attribute__((__format__(printf, 2, 0)))
int xvasprintf(char **strp, const char *fmt, va_list ap)
{ {
int ret = vasprintf(&(*strp), fmt, ap); int ret = vasprintf(&(*strp), fmt, ap);
if (ret < 0) if (ret < 0)
@ -109,7 +122,9 @@ xvasprintf(char **strp, const char *fmt, va_list ap)
} }
static inline char * __attribute__((warn_unused_result)) xgethostname(void) static inline
__attribute__((warn_unused_result))
char *xgethostname(void)
{ {
char *name; char *name;
size_t sz = get_hostname_max() + 1; size_t sz = get_hostname_max() + 1;