archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: replace BLI_snprintf with BLI_path_join

Browse Source 
Also use a larger buffer to account for the unlikely case of the
buffer not being big enough for the appended directories.
This commit is contained in:
Campbell Barton
2022-09-12 10:10:54 +10:00
parent cf9c0a4b50
commit f884a34cae
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/blenkernel/intern/packedFile.c
View File

@@ -526,21 +526,27 @@ static void unpack_generate_paths(const char *name,
BLI_strncpy(tempdir, "//", sizeof(tempdir));
}
switch (id_type) {
case ID_VF:
BLI_snprintf(r_relpath, relpathlen, "//fonts/%s", tempname);
break;
case ID_SO:
BLI_snprintf(r_relpath, relpathlen, "//sounds/%s", tempname);
break;
case ID_IM:
BLI_snprintf(r_relpath, relpathlen, "//textures/%s", tempname);
break;
case ID_VO:
BLI_snprintf(r_relpath, relpathlen, "//volumes/%s", tempname);
break;
default:
break;
{
const char *dir_name = NULL;
switch (id_type) {
case ID_VF:
dir_name = "fonts";
break;
case ID_SO:
dir_name = "sounds";
break;
case ID_IM:
dir_name = "textures";
break;
case ID_VO:
dir_name = "volumes";
break;
default:
break;
}
if (dir_name) {
BLI_path_join(r_relpath, relpathlen, "//", dir_name, tempname, NULL);
}
}
{