[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35336] trunk/blender: replace 0 with NULL when used as a pointer

Campbell Barton ideasman42 at gmail.com
Thu Mar 3 18:58:07 CET 2011


Revision: 35336
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35336
Author:   campbellbarton
Date:     2011-03-03 17:58:06 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
replace 0 with NULL when used as a pointer

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    trunk/blender/source/blender/blenkernel/intern/world.c
    trunk/blender/source/blender/blenlib/intern/storage.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/gpu/intern/gpu_draw.c
    trunk/blender/source/blender/gpu/intern/gpu_material.c
    trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
    trunk/blender/source/blender/imbuf/intern/allocimbuf.c
    trunk/blender/source/blender/imbuf/intern/anim_movie.c
    trunk/blender/source/blender/imbuf/intern/bmp.c
    trunk/blender/source/blender/imbuf/intern/divers.c
    trunk/blender/source/blender/imbuf/intern/iris.c
    trunk/blender/source/blender/imbuf/intern/jpeg.c
    trunk/blender/source/blender/imbuf/intern/png.c
    trunk/blender/source/blender/imbuf/intern/readimage.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesdna/intern/makesdna.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/makesrna/intern/rna_animation.c
    trunk/blender/source/blender/makesrna/intern/rna_define.c
    trunk/blender/source/blender/makesrna/intern/rna_nla.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c
    trunk/blender/source/blender/makesrna/intern/rna_pose.c
    trunk/blender/source/blender/makesrna/intern/rna_render.c
    trunk/blender/source/blender/makesrna/intern/rna_rna.c
    trunk/blender/source/blender/makesrna/intern/rna_ui.c
    trunk/blender/source/blender/makesrna/intern/rna_wm.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -195,7 +195,7 @@
 		thread_unlock_callback();
 }
 
-int MEM_check_memory_integrity()
+int MEM_check_memory_integrity(void)
 {
 	const char* err_val = NULL;
 	MemHead* listend;
@@ -205,7 +205,7 @@
 	
 	err_val = check_memlist(listend);
 
-	if (err_val == 0) return 0;
+	if (err_val == NULL) return 0;
 	return 1;
 }
 
@@ -286,7 +286,7 @@
 	
 	memh->tag1 = MEMTAG1;
 	memh->name = str;
-	memh->nextname = 0;
+	memh->nextname = NULL;
 	memh->len = len;
 	memh->mmap = 0;
 	memh->tag2 = MEMTAG2;
@@ -353,7 +353,7 @@
 	}
 	mem_unlock_thread();
 	print_error("Calloc returns null: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mem_in_use);
-	return 0;
+	return NULL;
 }
 
 /* note; mmap returns zero'd memory */
@@ -377,7 +377,7 @@
 	  close(fd);
 	}
 #else
-	memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
+	memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
 		   PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
 #endif
 
@@ -643,13 +643,13 @@
 		error = 2;
 		MemorY_ErroR(memh->name,"end corrupt");
 		name = check_memlist(memh);
-		if (name != 0){
+		if (name != NULL){
 			if (name != memh->name) MemorY_ErroR(name,"is also corrupt");
 		}
 	} else{
 		error = -1;
 		name = check_memlist(memh);
-		if (name == 0)
+		if (name == NULL)
 			MemorY_ErroR("free","pointer not in memlist");
 		else
 			MemorY_ErroR(name,"error in header");
@@ -671,14 +671,14 @@
 {
 	struct localLink *link= vlink;
 
-	if (link == 0) return;
-	if (listbase == 0) return;
+	if (link == NULL) return;
+	if (listbase == NULL) return;
 
-	link->next = 0;
+	link->next = NULL;
 	link->prev = listbase->last;
 
 	if (listbase->last) ((struct localLink *)listbase->last)->next = link;
-	if (listbase->first == 0) listbase->first = link;
+	if (listbase->first == NULL) listbase->first = link;
 	listbase->last = link;
 }
 
@@ -686,8 +686,8 @@
 {
 	struct localLink *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;
@@ -733,50 +733,50 @@
 
 	forw = membase->first;
 	if (forw) forw = MEMNEXT(forw);
-	forwok = 0;
+	forwok = NULL;
 	while(forw){
 		if (forw->tag1 != MEMTAG1 || forw->tag2 != MEMTAG2) break;
 		forwok = forw;
 		if (forw->next) forw = MEMNEXT(forw->next);
-		else forw = 0;
+		else forw = NULL;
 	}
 
 	back = (MemHead *) membase->last;
 	if (back) back = MEMNEXT(back);
-	backok = 0;
+	backok = NULL;
 	while(back){
 		if (back->tag1 != MEMTAG1 || back->tag2 != MEMTAG2) break;
 		backok = back;
 		if (back->prev) back = MEMNEXT(back->prev);
-		else back = 0;
+		else back = NULL;
 	}
 
 	if (forw != back) return ("MORE THAN 1 MEMORYBLOCK CORRUPT");
 
-	if (forw == 0 && back == 0){
+	if (forw == NULL && back == NULL){
 		/* geen foute headers gevonden dan maar op zoek naar memblock*/
 
 		forw = membase->first;
 		if (forw) forw = MEMNEXT(forw);
-		forwok = 0;
+		forwok = NULL;
 		while(forw){
 			if (forw == memh) break;
 			if (forw->tag1 != MEMTAG1 || forw->tag2 != MEMTAG2) break;
 			forwok = forw;
 			if (forw->next) forw = MEMNEXT(forw->next);
-			else forw = 0;
+			else forw = NULL;
 		}
-		if (forw == 0) return (0);
+		if (forw == NULL) return NULL;
 
 		back = (MemHead *) membase->last;
 		if (back) back = MEMNEXT(back);
-		backok = 0;
+		backok = NULL;
 		while(back){
 			if (back == memh) break;
 			if (back->tag1 != MEMTAG1 || back->tag2 != MEMTAG2) break;
 			backok = back;
 			if (back->prev) back = MEMNEXT(back->prev);
-			else back = 0;
+			else back = NULL;
 		}
 	}
 
@@ -791,16 +791,16 @@
 				backok->prev = (MemHead *)&forwok->next;
 				forwok->nextname = backok->name;
 			} else{
-				forwok->next = 0;
+				forwok->next = NULL;
   				membase->last = (struct localLink *) &forwok->next; 
 /*  				membase->last = (struct Link *) &forwok->next; */
 			}
 		} else{
 			if (backok){
-				backok->prev = 0;
+				backok->prev = NULL;
 				membase->first = &backok->next;
 			} else{
-				membase->first = membase->last = 0;
+				membase->first = membase->last = NULL;
 			}
 		}
 	} else{

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -1411,7 +1411,7 @@
 	if(ob->id.us==1) {
 		ob->id.lib= NULL;
 		ob->id.flag= LIB_LOCAL;
-		new_id(0, (ID *)ob, 0);
+		new_id(NULL, (ID *)ob, NULL);
 
 	}
 	else {
@@ -1430,9 +1430,9 @@
 		}
 		
 		if(local && lib==0) {
-			ob->id.lib= 0;
+			ob->id.lib= NULL;
 			ob->id.flag= LIB_LOCAL;
-			new_id(0, (ID *)ob, 0);
+			new_id(NULL, (ID *)ob, NULL);
 		}
 		else if(local && lib) {
 			obn= copy_object(ob);
@@ -1440,7 +1440,7 @@
 			
 			sce= bmain->scene.first;
 			while(sce) {
-				if(sce->id.lib==0) {
+				if(sce->id.lib==NULL) {
 					base= sce->base.first;
 					while(base) {
 						if(base->object==ob) {

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -1398,7 +1398,7 @@
 	unsigned int i, error = 0;
 
 	if(pf == NULL)
-		return 0;
+		return NULL;
 
 	if(!ptcache_file_header_begin_read(pf))
 		error = 1;

Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -558,7 +558,7 @@
 		//Using vertexs positions/normals as if a subsurface was applied 
 		if(smd->subsurfLevels)
 		{
-			SubsurfModifierData ssmd= {{0}};
+			SubsurfModifierData ssmd= {{NULL}};
 			ssmd.subdivType	= ME_CC_SUBSURF;		//catmull clark
 			ssmd.levels		= smd->subsurfLevels;	//levels
 

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -1364,7 +1364,7 @@
 	CCGSubSurf *ss = ccgdm->ss;
 	CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
 	GPUVertexAttribs gattribs;
-	DMVertexAttribs attribs= {{{0}}};
+	DMVertexAttribs attribs= {{{NULL}}};
 	MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE);
 	int gridSize = ccgSubSurf_getGridSize(ss);
 	int gridFaces = gridSize - 1;

Modified: trunk/blender/source/blender/blenkernel/intern/world.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/world.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenkernel/intern/world.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -160,7 +160,7 @@
 	}
 	
 	if(local && lib==0) {
-		wrld->id.lib= 0;
+		wrld->id.lib= NULL;
 		wrld->id.flag= LIB_LOCAL;
 		new_id(NULL, (ID *)wrld, NULL);
 	}

Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenlib/intern/storage.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -100,8 +100,7 @@
 static int totnum,actnum;
 static struct direntry *files;
 
-static struct ListBase dirbase_={
-	0,0};
+static struct ListBase dirbase_={NULL, NULL};
 static struct ListBase *dirbase = &dirbase_;
 
 /* can return NULL when the size is not big enough */
@@ -400,7 +399,7 @@
 	// filesel.c:freefilelist()
 
 	actnum = totnum = 0;
-	files = 0;
+	files = NULL;
 
 	BLI_builddir(dirname,"");
 	BLI_adddirstrings();

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-03-03 17:23:59 UTC (rev 35335)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-03-03 17:58:06 UTC (rev 35336)
@@ -5811,8 +5811,8 @@
 static void link_global(FileData *fd, BlendFileData *bfd)
 {
 	
-	bfd->curscreen= newlibadr(fd, 0, bfd->curscreen);
-	bfd->curscene= newlibadr(fd, 0, bfd->curscene);
+	bfd->curscreen= newlibadr(fd, NULL, bfd->curscreen);
+	bfd->curscene= newlibadr(fd, NULL, bfd->curscene);
 	// this happens in files older than 2.35
 	if(bfd->curscene==NULL) {
 		if(bfd->curscreen) bfd->curscene= bfd->curscreen->scene;
@@ -5825,7 +5825,7 @@
 	unsigned int *mcol, *mcoln, *mcolmain;
 	int a;
 
-	if(me->totface==0 || me->mcol==0) return;
+	if(me->totface==0 || me->mcol==NULL) return;
 
 	mcoln= mcolmain= MEM_mallocN(4*sizeof(int)*me->totface, "mcoln");
 	mcol = (unsigned int *)me->mcol;
@@ -6802,7 +6802,7 @@
 	float submat[3][3];
 	
 	copy_m3_m4(submat, bone->arm_mat);
-	mat3_to_vec_roll(submat, 0, &bone->arm_roll);
+	mat3_to_vec_roll(submat, NULL, &bone->arm_roll);
 	
 	for(child = bone->childbase.first; child; child = child->next)
 		do_version_bone_roll_256(child);
@@ -9013,7 +9013,7 @@
 							strcpy (simasel->dir,  U.textudir);	/* TON */
 							strcpy (simasel->file, "");
 							
-							simasel->returnfunc     =  0;	
+							simasel->returnfunc     =  NULL;
 							simasel->title[0]       =  0;
 						}
 					}
@@ -9303,7 +9303,7 @@
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 8)) {
 		Scene *sce;
 		Object *ob;
-		PartEff *paf=0;
+		PartEff *paf=NULL;
 
 		for(ob = main->object.first; ob; ob= ob->id.next) {
 			if(ob->soft && ob->soft->keys) {
@@ -9589,7 +9589,7 @@
 				
 				fluidmd->fss->lastgoodframe = INT_MAX;
 				fluidmd->fss->flag = 0;
-				fluidmd->fss->meshSurfNormals = 0;
+				fluidmd->fss->meshSurfNormals = NULL;
 			}
 		}
 	}
@@ -12491,7 +12491,7 @@
 	ID *id;
 	int a, doit= 1;
 
-	if(fd==0) return;
+	if(fd==NULL) return;
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list