mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(localtime) Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-05-12 04:43:36 +02:00
parent ef5d15e6f9
commit 62f3046f0f
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/menu_driver.c
View File

@ -378,6 +378,7 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
DATETIME_CHECK_INTERVAL)
{
time_t time_;
const struct tm *tm_;
menu_driver_datetime_last_time_us = menu_driver_current_time_us;
@ -386,53 +387,56 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
setlocale(LC_TIME, "");
tm_ = localtime(&time_);
/* Format string representation */
switch (datetime->time_mode)
{
case 0: /* Date and time */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%Y-%m-%d %H:%M:%S", localtime(&time_));
"%Y-%m-%d %H:%M:%S", tm_);
break;
case 1: /* YY-MM-DD HH:MM */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%Y-%m-%d %H:%M", localtime(&time_));
"%Y-%m-%d %H:%M", tm_);
break;
case 2: /* MM-DD-YYYY HH:MM */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%m-%d-%Y %H:%M", localtime(&time_));
"%m-%d-%Y %H:%M", tm_);
break;
case 3: /* Time */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%H:%M:%S", localtime(&time_));
"%H:%M:%S", tm_);
break;
case 4: /* Time (hours-minutes) */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%H:%M", localtime(&time_));
"%H:%M", tm_);
break;
case 5: /* Date and time, without year and seconds */
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%d/%m %H:%M", localtime(&time_));
"%d/%m %H:%M", tm_);
break;
case 6:
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%m/%d %H:%M", localtime(&time_));
"%m/%d %H:%M", tm_);
break;
case 7: /* Time (hours-minutes), in 12 hour AM-PM designation */
#if defined(__linux__) && !defined(ANDROID)
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%I : %M : %S %p", localtime(&time_));
"%I : %M : %S %p", tm_);
#else
{
char *local;
strftime(menu_datetime_cache, sizeof(menu_datetime_cache),
"%I:%M:%S %p", localtime(&time_));
"%I:%M:%S %p", tm_);
local = local_to_utf8_string_alloc(menu_datetime_cache);
if (local)
{
strlcpy(menu_datetime_cache, local, sizeof(menu_datetime_cache));
strlcpy(menu_datetime_cache,
local, sizeof(menu_datetime_cache));
free(local);
}
}

33
retroarch.c
View File

@ -5342,8 +5342,11 @@ finish:
void rarch_log_file_init(void)
{
FILE *fp = NULL;
settings_t *settings = config_get_ptr();
FILE *fp = NULL;
settings_t *settings = config_get_ptr();
bool log_to_file = settings->bools.log_to_file;
bool log_to_file_timestamp = settings->bools.log_to_file_timestamp;
bool logging_to_file = is_logging_to_file();
/* If this is the first run, generate a timestamped log
* file name (do this even when not outputting timestamped
@ -5351,25 +5354,24 @@ void rarch_log_file_init(void)
if (string_is_empty(timestamped_log_file_name))
{
char format[256];
time_t cur_time = time(NULL);
time_t cur_time = time(NULL);
const struct tm *tm_ = localtime(&cur_time);
format[0] = '\0';
strftime(format, sizeof(format), "retroarch__%Y_%m_%d__%H_%M_%S", localtime(&cur_time));
strftime(format, sizeof(format), "retroarch__%Y_%m_%d__%H_%M_%S", tm_);
fill_pathname_noext(timestamped_log_file_name, format,
file_path_str(FILE_PATH_EVENT_LOG_EXTENSION),
sizeof(timestamped_log_file_name));
}
/* If nothing has changed, do nothing */
if ((!settings->bools.log_to_file && !is_logging_to_file()) ||
(settings->bools.log_to_file && is_logging_to_file()))
if ((!log_to_file && !logging_to_file) ||
(log_to_file && logging_to_file))
return;
/* If we are currently logging to file and wish to stop,
* de-initialise existing logger... */
if (!settings->bools.log_to_file && is_logging_to_file())
if (!log_to_file && logging_to_file)
{
retro_main_log_file_deinit();
/* ...and revert to console */
@ -5382,11 +5384,9 @@ void rarch_log_file_init(void)
/* > Check whether we are already logging to console */
fp = (FILE*)retro_main_log_file();
/* De-initialise existing logger */
if (fp)
{
/* De-initialise existing logger */
retro_main_log_file_deinit();
}
/* > Attempt to initialise log file */
if (!string_is_empty(settings->paths.log_dir))
@ -5406,7 +5406,7 @@ void rarch_log_file_init(void)
/* Format log file name */
fill_pathname_join(buf, settings->paths.log_dir,
settings->bools.log_to_file_timestamp
log_to_file_timestamp
? timestamped_log_file_name
: file_path_str(FILE_PATH_DEFAULT_EVENT_LOG),
sizeof(buf));
@ -5415,7 +5415,7 @@ void rarch_log_file_init(void)
/* When RetroArch is launched, log file is overwritten.
* On subsequent calls within the same session, it is appended to. */
retro_main_log_file_init(buf, log_file_created);
if (is_logging_to_file())
if (logging_to_file)
log_file_created = true;
return;
}
@ -5478,11 +5478,10 @@ enum retro_language rarch_get_language_from_iso(const char *iso639)
{"el", RETRO_LANGUAGE_GREEK},
};
if (string_is_empty(iso639)) {
if (string_is_empty(iso639))
return lang;
}
for (i = 0; i < sizeof(pairs) / sizeof(pairs[0]); i++)
for (i = 0; i < ARRAY_SIZE(pairs); i++)
{
if (strcasestr(iso639, pairs[i].iso639))
{