kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup for thumbnails:

Browse Source 
- use URI_MAX define
- replace strcat with BLI_snprintf.
This commit is contained in:
Campbell Barton 2013-07-27 09:26:22 +00:00
parent 09aadea2cc
commit 9c8721e1a1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/imbuf/intern/thumbs.c
View File

@ -67,7 +67,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#define URI_MAX FILE_MAX * 3 + 8 #define URI_MAX (FILE_MAX * 3 + 8)
static int get_thumb_dir(char *dir, ThumbSize size) static int get_thumb_dir(char *dir, ThumbSize size)
{ {
@ -200,20 +200,20 @@ static int uri_from_filename(const char *path, char *uri)
strcat(orig_uri, vol); strcat(orig_uri, vol);
dirstart += 2; dirstart += 2;
} }
#else
BLI_strncpy(orig_uri, "file://", FILE_MAX);
#endif
strcat(orig_uri, dirstart); strcat(orig_uri, dirstart);
BLI_char_switch(orig_uri, '\\', '/'); BLI_char_switch(orig_uri, '\\', '/');
#else
BLI_snprintf(orig_uri, URI_MAX, "file://%s", dirstart);
#endif
#ifdef WITH_ICONV #ifdef WITH_ICONV
{ {
char uri_utf8[FILE_MAX * 3 + 8]; char uri_utf8[URI_MAX];
escape_uri_string(orig_uri, uri_utf8, FILE_MAX * 3 + 8, UNSAFE_PATH); escape_uri_string(orig_uri, uri_utf8, URI_MAX, UNSAFE_PATH);
BLI_string_to_utf8(uri_utf8, uri, NULL); BLI_string_to_utf8(uri_utf8, uri, NULL);
} }
#else #else
escape_uri_string(orig_uri, uri, FILE_MAX * 3 + 8, UNSAFE_PATH); escape_uri_string(orig_uri, uri, URI_MAX, UNSAFE_PATH);
#endif #endif
return 1; return 1;
} }
@ -401,7 +401,7 @@ ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, Im
ImBuf *IMB_thumb_read(const char *path, ThumbSize size) ImBuf *IMB_thumb_read(const char *path, ThumbSize size)
{ {
char thumb[FILE_MAX]; char thumb[FILE_MAX];
char uri[FILE_MAX * 3 + 8]; char uri[URI_MAX];
ImBuf *img = NULL; ImBuf *img = NULL;
if (!uri_from_filename(path, uri)) { if (!uri_from_filename(path, uri)) {
@ -418,7 +418,7 @@ ImBuf *IMB_thumb_read(const char *path, ThumbSize size)
void IMB_thumb_delete(const char *path, ThumbSize size) void IMB_thumb_delete(const char *path, ThumbSize size)
{ {
char thumb[FILE_MAX]; char thumb[FILE_MAX];
char uri[FILE_MAX * 3 + 8]; char uri[URI_MAX];
if (!uri_from_filename(path, uri)) { if (!uri_from_filename(path, uri)) {
return; return;
@ -438,7 +438,7 @@ void IMB_thumb_delete(const char *path, ThumbSize size)
ImBuf *IMB_thumb_manage(const char *path, ThumbSize size, ThumbSource source) ImBuf *IMB_thumb_manage(const char *path, ThumbSize size, ThumbSource source)
{ {
char thumb[FILE_MAX]; char thumb[FILE_MAX];
char uri[FILE_MAX * 3 + 8]; char uri[URI_MAX];
struct stat st; struct stat st;
ImBuf *img = NULL; ImBuf *img = NULL;