diff options
author | Ken Hughes <khughes@pacific.edu> | 2007-03-17 17:46:04 +0300 |
---|---|---|
committer | Ken Hughes <khughes@pacific.edu> | 2007-03-17 17:46:04 +0300 |
commit | 83e72cc813d8df8c5d0b2cb6e6e92e324c28787e (patch) | |
tree | 6b9507b1c05a3d48945e750581fb8f147c2b4bc4 /source/blender/blenlib | |
parent | 8e43b3f950430d345e35d7643faaaf4b6122c961 (diff) |
Fix various gcc warning, unused variables and incorrect type passed to
*printf functions.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c index 77ab4d67783..e4fc9cc92f9 100644 --- a/source/blender/blenlib/intern/util.c +++ b/source/blender/blenlib/intern/util.c @@ -741,10 +741,9 @@ void BLI_makestringcode(const char *relfile, char *file) char * p; char * q; char * lslash; - int len=0; char temp[FILE_MAXDIR+FILE_MAXFILE]; char res[FILE_MAXDIR+FILE_MAXFILE]; - + /* if file is already relative, bail out */ if(file[0]=='/' && file[1]=='/') return; @@ -823,7 +822,7 @@ void BLI_makestringcode(const char *relfile, char *file) int BLI_convertstringcode(char *path, const char *basepath, int framenum) { - int len, wasrelative, is_filepath; + int len, wasrelative; char tmp[FILE_MAXDIR+FILE_MAXFILE]; char base[FILE_MAXDIR]; char vol[3] = {'\0', '\0', '\0'}; @@ -1147,8 +1146,10 @@ int BLI_testextensie(const char *str, const char *ext) void BLI_split_dirfile(const char *string, char *dir, char *file) { int a; +#ifdef WIN32 int sl; short is_relative = 0; +#endif dir[0]= 0; file[0]= 0; @@ -1227,7 +1228,7 @@ void BLI_split_dirfile(const char *string, char *dir, char *file) BLI_getwdN(dir); strcat(dir,"/"); strcat(dir,string); - strcpy(string,dir); + strcpy((char *)string,dir); } BLI_make_exist(dir); |