diff options
| author | Gabriel Dume <gabriel.ddx84@gmail.com> | 2014-08-14 16:31:24 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-15 03:18:18 -0700 |
| commit | f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (patch) | |
| tree | 5b93402fb37cc43b899451a5d2b65bfc03d7887b /libavutil | |
| parent | efd26bedec9a345a5960dbfcbaec888418f2d4e6 (diff) | |
| download | ffmpeg-f929ab0569ff31ed5a59b0b0adb7ce09df3fca39.tar.gz | |
cosmetics: Write NULL pointer equality checks more compactly
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/eval.c | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 4 |
2 files changed, 3 insertions, 3 deletions
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;\ }\ |