diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-10 09:51:15 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-10 09:54:21 +0300 |
commit | 8cb3b49e51469b9689bfa44b85349149e17699dc (patch) | |
tree | 04307341165e0ee87aca82190c760af241027c32 /source/blender/imbuf/intern | |
parent | 489cb7fd7eb0ab4e34c084acd2bf740a878498e9 (diff) |
Cleanup: replace strncpy with BLI_strncpy
Also replace strncpy+strcat with BLI_string_join
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 9 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 8312476bda0..fa05f155b30 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -18,6 +18,7 @@ #include <time.h> #include "BLI_fileops.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" @@ -56,9 +57,8 @@ static void fillCineonMainHeader(LogImageFile *cineon, cineon->height * getRowLength(cineon->width, cineon->element[0]), cineon->isMSB); - strcpy(header->fileHeader.version, "v4.5"); - strncpy(header->fileHeader.file_name, filepath, 99); - header->fileHeader.file_name[99] = 0; + STRNCPY(header->fileHeader.version, "v4.5"); + STRNCPY(header->fileHeader.file_name, filepath); fileClock = time(NULL); fileTime = localtime(&fileClock); strftime(header->fileHeader.creation_date, 12, "%Y:%m:%d", fileTime); @@ -93,8 +93,7 @@ static void fillCineonMainHeader(LogImageFile *cineon, header->imageHeader.green_primary_y = swap_float(0.0f, cineon->isMSB); header->imageHeader.blue_primary_x = swap_float(0.0f, cineon->isMSB); header->imageHeader.blue_primary_y = swap_float(0.0f, cineon->isMSB); - strncpy(header->imageHeader.label, creator, 199); - header->imageHeader.label[199] = 0; + STRNCPY(header->imageHeader.label, creator); header->imageHeader.interleave = 0; header->imageHeader.data_sign = 0; header->imageHeader.sense = 0; diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 28c19116361..4c780032f0b 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -18,6 +18,7 @@ #include <time.h> #include "BLI_fileops.h" +#include "BLI_string.h" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" @@ -60,14 +61,12 @@ static void fillDpxMainHeader(LogImageFile *dpx, header->fileHeader.ind_hdr_size = swap_uint(sizeof(DpxFilmHeader) + sizeof(DpxTelevisionHeader), dpx->isMSB); header->fileHeader.user_data_size = DPX_UNDEFINED_U32; - strncpy(header->fileHeader.file_name, filename, 99); - header->fileHeader.file_name[99] = 0; + STRNCPY(header->fileHeader.file_name, filename); fileClock = time(NULL); fileTime = localtime(&fileClock); strftime(header->fileHeader.creation_date, 24, "%Y:%m:%d:%H:%M:%S%Z", fileTime); header->fileHeader.creation_date[23] = 0; - strncpy(header->fileHeader.creator, creator, 99); - header->fileHeader.creator[99] = 0; + STRNCPY(header->fileHeader.creator, creator); header->fileHeader.project[0] = 0; header->fileHeader.copyright[0] = 0; header->fileHeader.key = 0xFFFFFFFF; |