summaryrefslogtreecommitdiff
path: root/src/options.h
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2010-08-26 01:34:13 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2010-08-26 01:34:13 +0000
commit369e95c1df681537492ac4132fcc439a66dd7884 (patch)
tree3058d0f0bc0b6e2bfc578ce0120748c1f441c8b6 /src/options.h
parentd3bb74d0299714ee4e410e52b7a14bd22d0b22c6 (diff)
downloadeterm-369e95c1df681537492ac4132fcc439a66dd7884.tar.gz
Revert and re-apply badnull patch
Revert previous patch generated by badnull.cocci script, and apply the new one. The main difference is that assert and assert-like functions are not touched anymore. SVN revision: 51650
Diffstat (limited to 'src/options.h')
-rw-r--r--src/options.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/options.h b/src/options.h
index 00c3fdf..2acb680 100644
--- a/src/options.h
+++ b/src/options.h
@@ -83,7 +83,7 @@
} while (0)
#define CHECK_VALID_INDEX(i) (((i) >= image_bg) && ((i) < image_max))
-#define RESET_AND_ASSIGN(var, val) do {if ((var) != NULL) FREE(var); (var) = (val);} while (0)
+#define RESET_AND_ASSIGN(var, val) do {if ((var)) FREE(var); (var) = (val);} while (0)
#define BITFIELD_SET(var, field) ((var) |= (field))
#define BITFIELD_CLEAR(var, field) ((var) &= ~(field))