diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-10 13:37:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-10 13:37:04 +0400 |
commit | 1c6956a4d6b15ddca3588f1838d3b9903e7239af (patch) | |
tree | c8aee4e95b584f4c6f5a46a8a44d1ebcd491ab6b /source/blender/blenlib | |
parent | 2d677efb3b52814d5b96f1aa496d75083187b3fe (diff) |
quiet msvc/mingw compiler warnings.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 41e784ab707..8e46afdb877 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -115,7 +115,7 @@ void BLI_getlastdir(const char* dir, char *last, int maxlen); int BLI_testextensie(const char *str, const char *ext); int BLI_testextensie_array(const char *str, const char **ext_array); int BLI_testextensie_glob(const char *str, const char *ext_fnmatch); -int BLI_replace_extension(char *path, int maxlen, const char *ext); +int BLI_replace_extension(char *path, size_t maxlen, const char *ext); void BLI_uniquename(struct ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short len); int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, const char defname[], char delim, char *name, short name_len); void BLI_newname(char * name, int add); diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index bf73f2a3fce..2407078fc76 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -225,7 +225,8 @@ int BLI_copy_fileops(const char *file, const char *to) { int BLI_link(const char *file, const char *to) { callLocalErrorCallBack("Linking files is unsupported on Windows"); - + (void)file; + (void)to; return 1; } diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 0d3b17ace4b..06dc510f8c6 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1353,9 +1353,9 @@ int BLI_testextensie_glob(const char *str, const char *ext_fnmatch) } -int BLI_replace_extension(char *path, int maxlen, const char *ext) +int BLI_replace_extension(char *path, size_t maxlen, const char *ext) { - unsigned int a; + size_t a; for(a=strlen(path); a>0; a--) { if(path[a-1] == '.' || path[a-1] == '/' || path[a-1] == '\\') { diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index f39cfe14a75..90754e7d2bb 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -68,7 +68,7 @@ int BLI_getInstallationDir( char * str ) { int IsConsoleEmpty(void) { - CONSOLE_SCREEN_BUFFER_INFO csbi = {0}; + CONSOLE_SCREEN_BUFFER_INFO csbi = {{0}}; HANDLE hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); return GetConsoleScreenBufferInfo(hStdOutput, &csbi) && csbi.dwCursorPosition.X == 0 && csbi.dwCursorPosition.Y == 0; @@ -95,7 +95,7 @@ void RegisterBlendExtension(void) { char BlPath[MAX_PATH]; char InstallDir[FILE_MAXDIR]; char SysDir[FILE_MAXDIR]; - char* ThumbHandlerDLL; + const char* ThumbHandlerDLL; char RegCmd[MAX_PATH*2]; char MBox[256]; BOOL IsWOW64; |