Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-05 20:16:44 +02:00
Code Issues Projects Releases Wiki Activity

rename reserved identifiers per C standard

Browse Source
This commit is contained in:
Jfreegman
2014-09-22 21:24:45 -04:00
parent bf54cb36ef
commit 133c0e8d63
41 changed files with 316 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc_tools.c
View File

@ -35,7 +35,7 @@
#include "file_senders.h"
extern ToxWindow *prompt;
extern struct user_settings *user_settings_;
extern struct user_settings *user_settings;
static uint64_t current_unix_time;
@ -82,12 +82,12 @@ struct tm *get_time(void)
/*Puts the current time in buf in the format of [HH:mm:ss] */
void get_time_str(char *buf, int bufsize)
{
if (user_settings_->timestamps == TIMESTAMPS_OFF) {
if (user_settings->timestamps == TIMESTAMPS_OFF) {
buf[0] = '\0';
return;
}
const char *t = user_settings_->time == TIME_12 ? "[%-I:%M:%S] " : "[%H:%M:%S] ";
const char *t = user_settings->time == TIME_12 ? "[%-I:%M:%S] " : "[%H:%M:%S] ";
strftime(buf, bufsize, t, get_time());
}