|
 |
b15ea1 |
From c6122e960a412dd181dbea3ef0559640139a3c26 Mon Sep 17 00:00:00 2001
|
|
|
b15ea1 |
From: Peter Jones <pjones@redhat.com>
|
|
|
b15ea1 |
Date: Thu, 30 Jan 2020 13:54:34 -0500
|
|
|
b15ea1 |
Subject: [PATCH 76/86] util.h: minor whitespace cleanup
|
|
|
b15ea1 |
|
|
|
b15ea1 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
b15ea1 |
---
|
|
|
b15ea1 |
src/util.h | 102 ++++++++++++++++++++++++++---------------------------
|
|
|
b15ea1 |
1 file changed, 51 insertions(+), 51 deletions(-)
|
|
|
b15ea1 |
|
|
|
b15ea1 |
diff --git a/src/util.h b/src/util.h
|
|
|
b15ea1 |
index 4791223d962..b7b03931d7e 100644
|
|
|
b15ea1 |
--- a/src/util.h
|
|
|
b15ea1 |
+++ b/src/util.h
|
|
|
b15ea1 |
@@ -144,66 +144,66 @@ lcm(uint64_t x, uint64_t y)
|
|
|
b15ea1 |
}
|
|
|
b15ea1 |
|
|
|
b15ea1 |
#ifndef strdupa
|
|
|
b15ea1 |
-#define strdupa(s) \
|
|
|
b15ea1 |
- (__extension__ ({ \
|
|
|
b15ea1 |
- const char *__in = (s); \
|
|
|
b15ea1 |
- size_t __len = strlen (__in); \
|
|
|
b15ea1 |
- char *__out = (char *) alloca (__len + 1); \
|
|
|
b15ea1 |
- strcpy(__out, __in); \
|
|
|
b15ea1 |
- __out; \
|
|
|
b15ea1 |
+#define strdupa(s) \
|
|
|
b15ea1 |
+ (__extension__ ({ \
|
|
|
b15ea1 |
+ const char *__in = (s); \
|
|
|
b15ea1 |
+ size_t __len = strlen (__in); \
|
|
|
b15ea1 |
+ char *__out = (char *) alloca (__len + 1); \
|
|
|
b15ea1 |
+ strcpy(__out, __in); \
|
|
|
b15ea1 |
+ __out; \
|
|
|
b15ea1 |
}))
|
|
|
b15ea1 |
#endif
|
|
|
b15ea1 |
|
|
|
b15ea1 |
#ifndef strndupa
|
|
|
b15ea1 |
-#define strndupa(s, l) \
|
|
|
b15ea1 |
- (__extension__ ({ \
|
|
|
b15ea1 |
- const char *__in = (s); \
|
|
|
b15ea1 |
- size_t __len = strnlen (__in, (l)); \
|
|
|
b15ea1 |
- char *__out = (char *) alloca (__len + 1); \
|
|
|
b15ea1 |
- strncpy(__out, __in, __len); \
|
|
|
b15ea1 |
- __out[__len] = '\0'; \
|
|
|
b15ea1 |
- __out; \
|
|
|
b15ea1 |
+#define strndupa(s, l) \
|
|
|
b15ea1 |
+ (__extension__ ({ \
|
|
|
b15ea1 |
+ const char *__in = (s); \
|
|
|
b15ea1 |
+ size_t __len = strnlen (__in, (l)); \
|
|
|
b15ea1 |
+ char *__out = (char *) alloca (__len + 1); \
|
|
|
b15ea1 |
+ strncpy(__out, __in, __len); \
|
|
|
b15ea1 |
+ __out[__len] = '\0'; \
|
|
|
b15ea1 |
+ __out; \
|
|
|
b15ea1 |
}))
|
|
|
b15ea1 |
#endif
|
|
|
b15ea1 |
|
|
|
b15ea1 |
-#define asprintfa(str, fmt, args...) \
|
|
|
b15ea1 |
- ({ \
|
|
|
b15ea1 |
- char *_tmp = NULL; \
|
|
|
b15ea1 |
- int _rc; \
|
|
|
b15ea1 |
- *(str) = NULL; \
|
|
|
b15ea1 |
- _rc = asprintf((str), (fmt), ## args); \
|
|
|
b15ea1 |
- if (_rc > 0) { \
|
|
|
b15ea1 |
- _tmp = strdupa(*(str)); \
|
|
|
b15ea1 |
- if (!_tmp) { \
|
|
|
b15ea1 |
- _rc = -1; \
|
|
|
b15ea1 |
- } else { \
|
|
|
b15ea1 |
- free(*(str)); \
|
|
|
b15ea1 |
- *(str) = _tmp; \
|
|
|
b15ea1 |
- } \
|
|
|
b15ea1 |
- } else { \
|
|
|
b15ea1 |
- _rc = -1; \
|
|
|
b15ea1 |
- } \
|
|
|
b15ea1 |
- _rc; \
|
|
|
b15ea1 |
+#define asprintfa(str, fmt, args...) \
|
|
|
b15ea1 |
+ ({ \
|
|
|
b15ea1 |
+ char *_tmp = NULL; \
|
|
|
b15ea1 |
+ int _rc; \
|
|
|
b15ea1 |
+ *(str) = NULL; \
|
|
|
b15ea1 |
+ _rc = asprintf((str), (fmt), ## args); \
|
|
|
b15ea1 |
+ if (_rc > 0) { \
|
|
|
b15ea1 |
+ _tmp = strdupa(*(str)); \
|
|
|
b15ea1 |
+ if (!_tmp) { \
|
|
|
b15ea1 |
+ _rc = -1; \
|
|
|
b15ea1 |
+ } else { \
|
|
|
b15ea1 |
+ free(*(str)); \
|
|
|
b15ea1 |
+ *(str) = _tmp; \
|
|
|
b15ea1 |
+ } \
|
|
|
b15ea1 |
+ } else { \
|
|
|
b15ea1 |
+ _rc = -1; \
|
|
|
b15ea1 |
+ } \
|
|
|
b15ea1 |
+ _rc; \
|
|
|
b15ea1 |
})
|
|
|
b15ea1 |
|
|
|
b15ea1 |
-#define vasprintfa(str, fmt, ap) \
|
|
|
b15ea1 |
- ({ \
|
|
|
b15ea1 |
- char *_tmp = NULL; \
|
|
|
b15ea1 |
- int _rc; \
|
|
|
b15ea1 |
- *(str) = NULL; \
|
|
|
b15ea1 |
- _rc = vasprintf((str), (fmt), (ap)); \
|
|
|
b15ea1 |
- if (_rc > 0) { \
|
|
|
b15ea1 |
- _tmp = strdupa(*(str)); \
|
|
|
b15ea1 |
- if (!_tmp) { \
|
|
|
b15ea1 |
- _rc = -1; \
|
|
|
b15ea1 |
- } else { \
|
|
|
b15ea1 |
- free(*(str)); \
|
|
|
b15ea1 |
- *(str) = _tmp; \
|
|
|
b15ea1 |
- } \
|
|
|
b15ea1 |
- } else { \
|
|
|
b15ea1 |
- _rc = -1; \
|
|
|
b15ea1 |
- } \
|
|
|
b15ea1 |
- _rc; \
|
|
|
b15ea1 |
+#define vasprintfa(str, fmt, ap) \
|
|
|
b15ea1 |
+ ({ \
|
|
|
b15ea1 |
+ char *_tmp = NULL; \
|
|
|
b15ea1 |
+ int _rc; \
|
|
|
b15ea1 |
+ *(str) = NULL; \
|
|
|
b15ea1 |
+ _rc = vasprintf((str), (fmt), (ap)); \
|
|
|
b15ea1 |
+ if (_rc > 0) { \
|
|
|
b15ea1 |
+ _tmp = strdupa(*(str)); \
|
|
|
b15ea1 |
+ if (!_tmp) { \
|
|
|
b15ea1 |
+ _rc = -1; \
|
|
|
b15ea1 |
+ } else { \
|
|
|
b15ea1 |
+ free(*(str)); \
|
|
|
b15ea1 |
+ *(str) = _tmp; \
|
|
|
b15ea1 |
+ } \
|
|
|
b15ea1 |
+ } else { \
|
|
|
b15ea1 |
+ _rc = -1; \
|
|
|
b15ea1 |
+ } \
|
|
|
b15ea1 |
+ _rc; \
|
|
|
b15ea1 |
})
|
|
|
b15ea1 |
|
|
|
b15ea1 |
static inline ssize_t
|
|
|
b15ea1 |
--
|
|
|
b15ea1 |
2.24.1
|
|
|
b15ea1 |
|