[Bf-blender-cvs] [a5183d7] master: Code Cleanup: use NULL for pointer checks and remove joke.

[Campbell Barton]

Commit: a5183d7a87b3b7cad50b47d7bda24efbeddcade7
Author: Campbell Barton
Date:   Fri Nov 22 10:43:42 2013 +1100
http://developer.blender.org/rBa5183d7a87b3b7cad50b47d7bda24efbeddcade7

Code Cleanup: use NULL for pointer checks and remove joke.

===================================================================

M	intern/guardedalloc/intern/mmap_win.c
M	source/blender/imbuf/intern/anim_movie.c
M	source/blender/windowmanager/intern/wm_jobs.c

===================================================================

diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
index 6f03188..3096c58 100644
--- a/intern/guardedalloc/intern/mmap_win.c
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -182,14 +182,14 @@ static void mmap_addtail(volatile mmapListBase *listbase, void *vlink)
 {
 	struct mmapLink *link = vlink;
 
-	if (link == 0) return;
-	if (listbase == 0) return;
+	if (link == NULL) return;
+	if (listbase == NULL) return;
 
 	link->next = 0;
 	link->prev = listbase->last;
 
 	if (listbase->last) ((struct mmapLink *)listbase->last)->next = link;
-	if (listbase->first == 0) listbase->first = link;
+	if (listbase->first == NULL) listbase->first = link;
 	listbase->last = link;
 }
 
@@ -197,8 +197,8 @@ static void mmap_remlink(volatile mmapListBase *listbase, void *vlink)
 {
 	struct mmapLink *link = vlink;
 
-	if (link == 0) return;
-	if (listbase == 0) return;
+	if (link == NULL) return;
+	if (listbase == NULL) return;
 
 	if (link->next) link->next->prev = link->prev;
 	if (link->prev) link->prev->next = link->next;
@@ -211,8 +211,8 @@ static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr)
 {
 	MemMap *mm;
 
-	if (ptr == 0) return NULL;
-	if (listbase == 0) return NULL;
+	if (ptr == NULL) return NULL;
+	if (listbase == NULL) return NULL;
 	
 	mm = (MemMap *)listbase->first;
 	while (mm) {
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 63790cf..271e52d 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 6908588..b3856a2 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;