tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

code cleanup: use const args for writing files.

This commit is contained in:
Campbell Barton 2012-04-17 19:51:40 +00:00
parent 830013aabe
commit 149c52859b
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/BLO_undofile.h
View File

@ -47,7 +47,7 @@ typedef struct MemFile {
} MemFile; } MemFile;
/* actually only used writefile.c */ /* actually only used writefile.c */
extern void add_memfilechunk(MemFile *compare, MemFile *current, char *buf, unsigned int size); extern void add_memfilechunk(MemFile *compare, MemFile *current, const char *buf, unsigned int size);
/* exports */ /* exports */
extern void BLO_free_memfile(MemFile *memfile); extern void BLO_free_memfile(MemFile *memfile);

2
source/blender/blenloader/BLO_writefile.h
View File

@ -37,7 +37,7 @@ struct MemFile;
struct Main; struct Main;
struct ReportList; struct ReportList;
extern int BLO_write_file(struct Main *mainvar, const char *filepath, int write_flags, struct ReportList *reports, int *thumb); extern int BLO_write_file(struct Main *mainvar, const char *filepath, int write_flags, struct ReportList *reports, const int *thumb);
extern int BLO_write_file_mem(struct Main *mainvar, struct MemFile *compare, struct MemFile *current, int write_flags); extern int BLO_write_file_mem(struct Main *mainvar, struct MemFile *compare, struct MemFile *current, int write_flags);
#define BLEN_THUMB_SIZE 128 #define BLEN_THUMB_SIZE 128

10
source/blender/blenloader/intern/undofile.c
View File

@ -85,9 +85,11 @@ void BLO_merge_memfile(MemFile *first, MemFile *second)
BLO_free_memfile(first); BLO_free_memfile(first);
} }
static int my_memcmp(int *mem1, int *mem2, int len) static int my_memcmp(const int *mem1, const int *mem2, const int len)
{ {
register int a= len, *mema= mem1, *memb= mem2; register int a = len;
register const int *mema = mem1;
register const int *memb = mem2;
while (a--) { while (a--) {
if ( *mema != *memb) return 1; if ( *mema != *memb) return 1;
@ -97,7 +99,7 @@ static int my_memcmp(int *mem1, int *mem2, int len)
return 0; return 0;
} }
void add_memfilechunk(MemFile *compare, MemFile *current, char *buf, unsigned int size) void add_memfilechunk(MemFile *compare, MemFile *current, const char *buf, unsigned int size)
{ {
static MemFileChunk *compchunk=NULL; static MemFileChunk *compchunk=NULL;
MemFileChunk *curchunk; MemFileChunk *curchunk;
@ -121,7 +123,7 @@ void add_memfilechunk(MemFile *compare, MemFile *current, char *buf, unsigned in
/* we compare compchunk with buf */ /* we compare compchunk with buf */
if (compchunk) { if (compchunk) {
if (compchunk->size == curchunk->size) { if (compchunk->size == curchunk->size) {
if ( my_memcmp((int *)compchunk->buf, (int *)buf, size/4)==0) { if (my_memcmp((int *)compchunk->buf, (const int *)buf, size / 4) == 0) {
curchunk->buf= compchunk->buf; curchunk->buf= compchunk->buf;
curchunk->ident= 1; curchunk->ident= 1;
} }

28
source/blender/blenloader/intern/writefile.c
View File

@ -204,7 +204,7 @@ static WriteData *writedata_new(int file)
return wd; return wd;
} }
static void writedata_do_write(WriteData *wd, void *mem, int memlen) static void writedata_do_write(WriteData *wd, const void *mem, int memlen)
{ {
if ((wd == NULL) || wd->error || (mem == NULL) || memlen < 1) return; if ((wd == NULL) || wd->error || (mem == NULL) || memlen < 1) return;
if (wd->error) return; if (wd->error) return;
@ -239,7 +239,7 @@ static void writedata_free(WriteData *wd)
#define MYWRITE_FLUSH NULL #define MYWRITE_FLUSH NULL
static void mywrite( WriteData *wd, void *adr, int len) static void mywrite( WriteData *wd, const void *adr, int len)
{ {
if (wd->error) return; if (wd->error) return;
@ -265,7 +265,7 @@ static void mywrite( WriteData *wd, void *adr, int len)
do { do {
int writelen= MIN2(len, MYWRITE_MAX_CHUNK); int writelen= MIN2(len, MYWRITE_MAX_CHUNK);
writedata_do_write(wd, adr, writelen); writedata_do_write(wd, adr, writelen);
adr = (char*)adr + writelen; adr = (const char *)adr + writelen;
len -= writelen; len -= writelen;
} while (len > 0); } while (len > 0);
@ -354,22 +354,22 @@ static void writestruct(WriteData *wd, int filecode, const char *structname, int
mywrite(wd, adr, bh.len); mywrite(wd, adr, bh.len);
} }
static void writedata(WriteData *wd, int filecode, int len, void *adr) /* do not use for structs */ static void writedata(WriteData *wd, int filecode, int len, const void *adr) /* do not use for structs */
{ {
BHead bh; BHead bh;
if (adr==NULL) return; if (adr==NULL) return;
if (len==0) return; if (len==0) return;
len+= 3; len += 3;
len-= ( len % 4); len -= (len % 4);
/* init BHead */ /* init BHead */
bh.code= filecode; bh.code = filecode;
bh.old= adr; bh.old = (void *)adr; /* this is safe to cast from const */
bh.nr= 1; bh.nr = 1;
bh.SDNAnr= 0; bh.SDNAnr = 0;
bh.len= len; bh.len = len;
mywrite(wd, &bh, sizeof(BHead)); mywrite(wd, &bh, sizeof(BHead));
if (len) mywrite(wd, adr, len); if (len) mywrite(wd, adr, len);
@ -2764,7 +2764,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
* second are an RGBA image (unsigned char) * second are an RGBA image (unsigned char)
* note, this uses 'TEST' since new types will segfault on file load for older blender versions. * note, this uses 'TEST' since new types will segfault on file load for older blender versions.
*/ */
static void write_thumb(WriteData *wd, int *img) static void write_thumb(WriteData *wd, const int *img)
{ {
if (img) if (img)
writedata(wd, TEST, (2 + img[0] * img[1]) * sizeof(int), img); writedata(wd, TEST, (2 + img[0] * img[1]) * sizeof(int), img);
@ -2772,7 +2772,7 @@ static void write_thumb(WriteData *wd, int *img)
/* if MemFile * there's filesave to memory */ /* if MemFile * there's filesave to memory */
static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFile *current, static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFile *current,
int write_user_block, int write_flags, int *thumb) int write_user_block, int write_flags, const int *thumb)
{ {
BHead bhead; BHead bhead;
ListBase mainlist; ListBase mainlist;
@ -2880,7 +2880,7 @@ static int do_history(const char *name, ReportList *reports)
} }
/* return: success (1) */ /* return: success (1) */
int BLO_write_file(Main *mainvar, const char *filepath, int write_flags, ReportList *reports, int *thumb) int BLO_write_file(Main *mainvar, const char *filepath, int write_flags, ReportList *reports, const int *thumb)
{ {
char userfilename[FILE_MAX]; char userfilename[FILE_MAX];
char tempname[FILE_MAX+1]; char tempname[FILE_MAX+1];