ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cut down on strlcats and use strftime return value

This commit is contained in:
libretroadmin 2023-07-17 11:26:48 +02:00
parent 40049274b2
commit 4a411eb1e5
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libretro-common/file/file_path.c
View File

@ -537,14 +537,14 @@ void fill_pathname_parent_dir(char *out_dir,
size_t fill_dated_filename(char *out_filename, size_t fill_dated_filename(char *out_filename,
const char *ext, size_t size) const char *ext, size_t size)
{ {
time_t cur_time = time(NULL); size_t _len;
struct tm tm_; struct tm tm_;
time_t cur_time = time(NULL);
rtime_localtime(&cur_time, &tm_); rtime_localtime(&cur_time, &tm_);
_len = strftime(out_filename, size,
strftime(out_filename, size,
"RetroArch-%m%d-%H%M%S", &tm_); "RetroArch-%m%d-%H%M%S", &tm_);
return strlcat(out_filename, ext, size); _len += strlcpy(out_filename + _len, ext, size - _len);
return _len;
} }
/** /**
@ -569,18 +569,19 @@ size_t fill_str_dated_filename(char *out_filename,
char format[NAME_MAX_LENGTH]; char format[NAME_MAX_LENGTH];
size_t _len = 0; size_t _len = 0;
time_t cur_time = time(NULL); time_t cur_time = time(NULL);
rtime_localtime(&cur_time, &tm_); rtime_localtime(&cur_time, &tm_);
_len = strlcpy(out_filename, in_str, size);
strlcpy(out_filename, in_str, size);
if (string_is_empty(ext)) if (string_is_empty(ext))
{ {
strftime(format, sizeof(format), "-%y%m%d-%H%M%S", &tm_); strftime(format, sizeof(format), "-%y%m%d-%H%M%S", &tm_);
return strlcat(out_filename, format, size); _len += strlcpy(out_filename + _len, format, size - _len);
}
else
{
strftime(format, sizeof(format), "-%y%m%d-%H%M%S.", &tm_);
_len += strlcpy(out_filename + _len, format, size - _len);
_len += strlcpy(out_filename + _len, ext, size - _len);
} }
strftime(format, sizeof(format), "-%y%m%d-%H%M%S.", &tm_);
_len = strlcat(out_filename, format, size);
_len += strlcpy(out_filename + _len, ext, size - _len);
return _len; return _len;
} }