diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-22 03:43:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-22 03:43:42 +0400 |
commit | a5183d7a87b3b7cad50b47d7bda24efbeddcade7 (patch) | |
tree | 96d0544c432ee1fc3edf18eee23353da6be1d0d7 /source/blender | |
parent | f801f8057da824a2306963ea1b10bb5917a267c7 (diff) |
Code Cleanup: use NULL for pointer checks and remove joke.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 63790cf7d25..271e52da1d4 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -477,7 +477,7 @@ static int startffmpeg(struct anim *anim) const int *inv_table; #endif - if (anim == 0) return(-1); + if (anim == NULL) return(-1); streamcount = anim->streamindex; @@ -960,7 +960,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position, int new_frame_index = 0; /* To quiet gcc barking... */ int old_frame_index = 0; /* To quiet gcc barking... */ - if (anim == 0) return (0); + if (anim == NULL) return (0); av_log(anim->pFormatCtx, AV_LOG_DEBUG, "FETCH: pos=%d\n", position); diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 6908588ebd7..b3856a2aa9c 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -523,9 +523,9 @@ void WM_jobs_kill(wmWindowManager *wm, void *owner, void (*startjob)(void *, sho wm_job = wm->jobs.first; while (wm_job) { if (wm_job->owner == owner || wm_job->startjob == startjob) { - wmJob *bill = wm_job; + wmJob *wm_job_kill = wm_job; wm_job = wm_job->next; - wm_jobs_kill_job(wm, bill); + wm_jobs_kill_job(wm, wm_job_kill); } else { wm_job = wm_job->next; |