[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28514] trunk/blender: use size_t for MEM_allocN_len as well as some of its callers

[Campbell Barton]

Revision: 28514
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28514
Author:   campbellbarton
Date:     2010-04-29 23:46:25 +0200 (Thu, 29 Apr 2010)

Log Message:
-----------
use size_t for MEM_allocN_len as well as some of its callers

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/blenkernel/intern/library.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h	2010-04-29 19:41:12 UTC (rev 28513)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h	2010-04-29 21:46:25 UTC (rev 28514)
@@ -66,7 +66,7 @@
 	/** Returns the lenght of the allocated memory segment pointed at
 	 * by vmemh. If the pointer was not previously allocated by this
 	 * module, the result is undefined.*/
-	int MEM_allocN_len(void *vmemh);
+	size_t MEM_allocN_len(void *vmemh);
 
 	/**
 	 * Release memory previously allocatred by this module. 

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2010-04-29 19:41:12 UTC (rev 28513)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2010-04-29 21:46:25 UTC (rev 28514)
@@ -220,7 +220,7 @@
 	malloc_debug_memset= 1;
 }
 
-int MEM_allocN_len(void *vmemh)
+size_t MEM_allocN_len(void *vmemh)
 {
 	if (vmemh) {
 		MemHead *memh= vmemh;

Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c	2010-04-29 19:41:12 UTC (rev 28513)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2010-04-29 21:46:25 UTC (rev 28514)
@@ -650,7 +650,7 @@
 	ID *idn, *id;
 	ListBase *lb;
 	char *cp, *cpn;
-	int idn_len;
+	size_t idn_len;
 	
 	id= rt;
 

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-04-29 19:41:12 UTC (rev 28513)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-04-29 21:46:25 UTC (rev 28514)
@@ -586,7 +586,7 @@
 
 	if (seq->type == SEQ_IMAGE) {
 		/* Hack? */
-		int olen = MEM_allocN_len(seq->strip->stripdata)/sizeof(struct StripElem);
+		size_t olen = MEM_allocN_len(seq->strip->stripdata)/sizeof(struct StripElem);
 		seq->len = olen;
 		seq->len -= seq->anim_startofs;
 		seq->len -= seq->anim_endofs;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-29 19:41:12 UTC (rev 28513)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-29 21:46:25 UTC (rev 28514)
@@ -1357,7 +1357,8 @@
 #else
 	long long *lpoin, *lmat;
 #endif
-	int len, *ipoin, *imat;
+	int *ipoin, *imat;
+	size_t len;
 
 		/* manually convert the pointer array in
 		 * the old dna format to a pointer array in