philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify and clean up putlog()

Browse Source
This commit is contained in:
Kevin Easton
2017-04-11 01:44:47 +10:00
parent 3cf21ccc9d
commit 83770fd645
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/misc.h
View File

@@ -81,7 +81,7 @@ extern LastMsg last_sent_ctcp[2];
char *BX_random_str (int, int); char *BX_random_str (int, int);
void check_auto_away (time_t); void check_auto_away (time_t);
ChannelList * BX_prepare_command (int *, char *, int); ChannelList * BX_prepare_command (int *, char *, int);
void putlog (int, ...); void putlog(int type, const char *chname, const char *format, ...);
void add_mode_buffer ( char *, int); void add_mode_buffer ( char *, int);
void flush_mode (ChannelList *); void flush_mode (ChannelList *);

31
source/misc.c
View File

@@ -1200,42 +1200,33 @@ void check_auto_away(time_t idlet)
/*char *logfile[] = { "tcl.log", "msg.log", NULL };*/ /*char *logfile[] = { "tcl.log", "msg.log", NULL };*/
/* putlog(level,channel_name,format,...); */ /* putlog(level,channel_name,format,...); */
void putlog(int type, ...) void putlog(int type, const char *chname, const char *format, ...)
{ {
#ifdef PUBLIC_ACCESS #ifdef PUBLIC_ACCESS
return; return;
#else #else
va_list va; va_list va;
time_t t; char *logfilen;
char *format, char ftime[40];
*chname,
*logfilen = NULL,
s[BIG_BUFFER_SIZE+1],
s1[40],
s2[BIG_BUFFER_SIZE+1];
FILE *f; FILE *f;
if (!get_int_var(BOT_LOG_VAR)) if (!get_int_var(BOT_LOG_VAR))
return; return;
if (!(logfilen = get_string_var(BOT_LOGFILE_VAR))) if (!(logfilen = get_string_var(BOT_LOGFILE_VAR)))
return; return;
va_start(va, type); strftime(ftime, sizeof ftime, "%I:%M%p", localtime(&now));
t = now;
strftime(s1, 30, "%I:%M%p", localtime(&t));
chname=va_arg(va,char *);
format=va_arg(va,char *);
vsprintf(s,format,va);
if (!*s)
strcpy(s2,empty_string);
else
sprintf(s2,"[%s] %s",s1,s);
if (chname && *chname =='*') if (chname && *chname =='*')
{ {
if ((f = fopen(logfilen, "a+")) != NULL) if ((f = fopen(logfilen, "a+")) != NULL)
{ {
fprintf(f,"%s\n",s2); va_start(va, format);
fprintf(f, "[%s] ", ftime);
vfprintf(f, format, va);
fprintf(f, "\n");
va_end(va);
fclose(f); fclose(f);
} }
} }