From f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 Mon Sep 17 00:00:00 2001 From: Gabriel Dume Date: Thu, 14 Aug 2014 16:31:24 -0400 Subject: cosmetics: Write NULL pointer equality checks more compactly Signed-off-by: Diego Biurrun --- libavutil/eval.c | 2 +- libavutil/internal.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libavutil') diff --git a/libavutil/eval.c b/libavutil/eval.c index 72f976ca4b..31e9ebbc9c 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -231,7 +231,7 @@ static int parse_primary(AVExpr **e, Parser *p) } p->s= strchr(p->s, '('); - if (p->s==NULL) { + if (!p->s) { av_log(p, AV_LOG_ERROR, "Undefined constant or missing '(' in '%s'\n", s0); p->s= next; av_expr_free(d); diff --git a/libavutil/internal.h b/libavutil/internal.h index 067c6ca303..aed9925e7c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -117,7 +117,7 @@ #define FF_ALLOC_OR_GOTO(ctx, p, size, label)\ {\ p = av_malloc(size);\ - if (p == NULL && (size) != 0) {\ + if (!(p) && (size) != 0) {\ av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ goto label;\ }\ @@ -126,7 +126,7 @@ #define FF_ALLOCZ_OR_GOTO(ctx, p, size, label)\ {\ p = av_mallocz(size);\ - if (p == NULL && (size) != 0) {\ + if (!(p) && (size) != 0) {\ av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ goto label;\ }\ -- cgit v1.2.3