koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from d-e-s-o/fix-FREE

Browse Source 
do not check for NULL in FREE macro
This commit is contained in:
Ingo Bürk
2017-11-29 08:33:27 +01:00
committed by GitHub
parent 3e34122de4 865bd462b4
commit f6f198c3fe
5 changed files with 20 additions and 30 deletions
i3-config-wizard
main.c
i3-input
i3-input.h
i3-nagbar
i3-nagbar.h
i3bar/include
util.h
include
util.h

10
i3-config-wizard/main.c

@ -58,12 +58,10 @@
#error "SYSCONFDIR not defined" #error "SYSCONFDIR not defined"
#endif #endif
#define FREE(pointer) \ #define FREE(pointer) \
do { \ do { \
if (pointer != NULL) { \ free(pointer); \
free(pointer); \ pointer = NULL; \
pointer = NULL; \
} \
} while (0) } while (0)
#include "xcb.h" #include "xcb.h"

10
i3-input/i3-input.h

@ -5,12 +5,10 @@
#include <err.h> #include <err.h>
#define die(...) errx(EXIT_FAILURE, __VA_ARGS__); #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
#define FREE(pointer) \ #define FREE(pointer) \
do { \ do { \
if (pointer != NULL) { \ free(pointer); \
free(pointer); \ pointer = NULL; \
pointer = NULL; \
} \
} while (0) } while (0)
extern xcb_window_t root; extern xcb_window_t root;

10
i3-nagbar/i3-nagbar.h

@ -5,12 +5,10 @@
#include <err.h> #include <err.h>
#define die(...) errx(EXIT_FAILURE, __VA_ARGS__); #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
#define FREE(pointer) \ #define FREE(pointer) \
do { \ do { \
if (pointer != NULL) { \ free(pointer); \
free(pointer); \ pointer = NULL; \
pointer = NULL; \
} \
} while (0) } while (0)
#define xmacro(atom) xcb_atom_t A_##atom; #define xmacro(atom) xcb_atom_t A_##atom;

10
i3bar/include/util.h

@ -20,12 +20,10 @@
#define STARTS_WITH(string, len, needle) (((len) >= strlen((needle))) && strncasecmp((string), (needle), strlen((needle))) == 0) #define STARTS_WITH(string, len, needle) (((len) >= strlen((needle))) && strncasecmp((string), (needle), strlen((needle))) == 0)
/* Securely free p */ /* Securely free p */
#define FREE(p) \ #define FREE(p) \
do { \ do { \
if (p != NULL) { \ free(p); \
free(p); \ p = NULL; \
p = NULL; \
} \
} while (0) } while (0)
/* Securely free single-linked list */ /* Securely free single-linked list */

10
include/util.h

@ -47,12 +47,10 @@
break; \ break; \
} }
#define FREE(pointer) \ #define FREE(pointer) \
do { \ do { \
if (pointer != NULL) { \ free(pointer); \
free(pointer); \ pointer = NULL; \
pointer = NULL; \
} \
} while (0) } while (0)
#define CALL(obj, member, ...) obj->member(obj, ##__VA_ARGS__) #define CALL(obj, member, ...) obj->member(obj, ##__VA_ARGS__)