diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2019-12-25 22:16:43 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2019-12-25 22:16:43 +0300 |
| commit | 6657fcc78375948ea04d860a015d146f2686a051 (patch) | |
| tree | 388a42fcb2fad18fc0b9c1cacdb1ae68a6ea0338 /source | |
| parent | 9aab9970c6130e581ad22a0ece3880d51dd68c1e (diff) | |
Cleanup: Remove BLI_stringenc_path
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 6 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 |
3 files changed, 3 insertions, 21 deletions
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index d2f651609f1..75d5cb286ac 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -81,12 +81,6 @@ bool BLI_ensure_filename(char *filepath, size_t maxlen, const char *filename) AT int BLI_stringdec(const char *string, char *head, char *start, unsigned short *numlen); void BLI_stringenc( char *string, const char *head, const char *tail, unsigned short numlen, int pic); -void BLI_stringenc_path(char *string, - const char *dir, - const char *head, - const char *tail, - unsigned short numlen, - int pic); /* removes trailing slash */ void BLI_cleanup_file(const char *relabase, char *path) ATTR_NONNULL(2); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index cd1a0e2c328..dff1f77c1ab 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -157,20 +157,6 @@ void BLI_stringenc( sprintf(string, "%s%.*d%s", head, numlen, MAX2(0, pic), tail); } -/** - * Returns in area pointed to by string a string of the form "<dir><head><pic><tail>", where pic - * is formatted as numlen digits with leading zeroes. - */ -void BLI_stringenc_path(char *string, - const char *dir, - const char *head, - const char *tail, - unsigned short numlen, - int pic) -{ - sprintf(string, "%s%s%.*d%s", dir, head, numlen, MAX2(0, pic), tail); -} - static int BLI_path_unc_prefix_len(const char *path); /* defined below in same file */ /* ******************** string encoding ***************** */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 9b091979f1e..586d7995ed8 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1318,7 +1318,9 @@ static int image_get_udim(char *filepath, LinkNodePair *udim_tiles) BLI_filelist_free(dir, totfile); if (is_udim && has_primary) { - BLI_stringenc_path(filepath, dirname, base_head, base_tail, digits, 1001); + char primary_filename[FILE_MAX]; + BLI_stringenc(primary_filename, base_head, base_tail, digits, 1001); + BLI_join_dirfile(filepath, FILE_MAX, dirname, primary_filename); return max_udim - 1000; } return 0; |