Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Luc Peurière <jlp@nerim.net>2005-03-09 22:45:59 +0300
committerJean-Luc Peurière <jlp@nerim.net>2005-03-09 22:45:59 +0300
commitc78e44cdc563853c250da78ee78ba622c39126b2 (patch)
treefb116af7e1edd94ef96ae883bea727be372e2bd2 /source/blender/blenloader/intern
parent77d44e88e95d86661fc8b29db923083ec747cf9d (diff)
big warning hunt commit
lot of casts, added prototypes, missing includes and some true errors
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readblenentry.c6
-rw-r--r--source/blender/blenloader/intern/readfile.c8
-rw-r--r--source/blender/blenloader/intern/undofile.c2
-rw-r--r--source/blender/blenloader/intern/writefile.c2
4 files changed, 14 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index fe39effdc01..5c31217a31f 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -115,6 +115,10 @@ static IDType idtypes[]= {
};
static int nidtypes= sizeof(idtypes)/sizeof(idtypes[0]);
+/* local prototypes --------------------- */
+void BLO_blendhandle_print_sizes(BlendHandle *, void *);
+
+
static IDType *idtype_from_name(char *str)
{
int i= nidtypes;
@@ -191,7 +195,7 @@ void BLO_blendhandle_print_sizes(BlendHandle *bh, void *fp)
buf[2]= buf[2]?buf[2]:' ';
buf[3]= buf[3]?buf[3]:' ';
- fprintf(fp, "['%.4s', '%s', %d, %d], \n", buf, name, bhead->nr, bhead->len+sizeof(BHead));
+ fprintf(fp, "['%.4s', '%s', %d, %ld ], \n", buf, name, bhead->nr, bhead->len+sizeof(BHead));
}
}
fprintf(fp, "]\n");
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index af04a701ccc..68bd3946e55 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -227,6 +227,12 @@ typedef struct OldNewMap {
int lasthit;
} OldNewMap;
+
+/* local prototypes */
+void lib_link_screen_restore(Main *, char , Scene *);
+extern short freeN(void *vmemh); /* defined in util.h */
+
+
static OldNewMap *oldnewmap_new(void) {
OldNewMap *onm= MEM_mallocN(sizeof(*onm), "OldNewMap");
onm->lasthit= 0;
@@ -2544,7 +2550,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
Sequence temp;
char *poin;
long offset;
- int seted=0;
+ /*int seted=0;*/ /*unused*/
offset= ((long)&(temp.seqbase)) - ((long)&temp);
diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c
index af278c89133..f16fb5e7b17 100644
--- a/source/blender/blenloader/intern/undofile.c
+++ b/source/blender/blenloader/intern/undofile.c
@@ -66,7 +66,7 @@ void BLO_free_memfile(MemFile *memfile)
{
MemFileChunk *chunk;
- while(chunk = (memfile->chunks.first) ) {
+ while( (chunk = (memfile->chunks.first) ) ) {
if(chunk->ident==0) MEM_freeN(chunk->buf);
BLI_remlink(&memfile->chunks, chunk);
MEM_freeN(chunk);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index e5b6177aea4..a2a2debad83 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1514,7 +1514,7 @@ static int write_file_handle(int handle, MemFile *compare, MemFile *current, int
ListBase mainlist;
char buf[13];
WriteData *wd;
- int data;
+/* int data; */ /*unused*/
mainlist.first= mainlist.last= G.main;
G.main->next= NULL;