zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #505 from Explorer09/xStrdup 

Fix xStrdup debug build failure & allow Clang to use ((nonnull))
This commit is contained in:
Hisham Muhammad 2016-06-04 11:45:29 -03:00
parent f9c1db514d c0e37bc5f5
commit 9ec41d1b65
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XAlloc.c
View File

@ -5,12 +5,12 @@
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
#include <assert.h>
#include <err.h> #include <err.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/*{ /*{
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
}*/ }*/
@ -52,9 +52,13 @@ void* xRealloc(void* ptr, size_t size) {
# define xStrdup(str_) (assert(str_), xStrdup_(str_)) # define xStrdup(str_) (assert(str_), xStrdup_(str_))
#endif #endif
#if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) #ifndef __has_attribute // Clang's macro
# define __has_attribute(x) 0
#endif
#if (__has_attribute(nonnull) || \
((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)))
char* xStrdup_(const char* str) __attribute__((nonnull)); char* xStrdup_(const char* str) __attribute__((nonnull));
#endif // GNU C 3.3 or later #endif // __has_attribute(nonnull) || GNU C 3.3 or later
char* xStrdup_(const char* str) { char* xStrdup_(const char* str) {
char* data = strdup(str); char* data = strdup(str);

9
XAlloc.h
View File

@ -7,6 +7,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
void* xMalloc(size_t size); void* xMalloc(size_t size);
@ -23,9 +24,13 @@ void* xRealloc(void* ptr, size_t size);
# define xStrdup(str_) (assert(str_), xStrdup_(str_)) # define xStrdup(str_) (assert(str_), xStrdup_(str_))
#endif #endif
#if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) #ifndef __has_attribute // Clang's macro
# define __has_attribute(x) 0
#endif
#if (__has_attribute(nonnull) || \
((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)))
char* xStrdup_(const char* str) __attribute__((nonnull)); char* xStrdup_(const char* str) __attribute__((nonnull));
#endif // GNU C 3.3 or later #endif // __has_attribute(nonnull) || GNU C 3.3 or later
char* xStrdup_(const char* str); char* xStrdup_(const char* str);