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

functions.c: Fix mismatched format strings in several aliases and functions.

Browse Source 
Affected functions are alias_idle(), alias_serverlag(), alias_awaytime(),
function_serverpass(), function_checkuser() and function_isuser().

This fixes $serverpass(), which seems to have never worked right.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@470 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-11-16 01:33:53 +00:00
parent 55d3b28060
commit 5a3a74d38a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/functions.c
View File

@@ -1095,7 +1095,7 @@ static char *alias_invite (void) { return m_strdup((invite_channel) ? invite_c
static char *alias_oper (void) { return m_strdup(get_server_operator(from_server) ? get_string_var(STATUS_OPER_VAR) : empty_string); } static char *alias_oper (void) { return m_strdup(get_server_operator(from_server) ? get_string_var(STATUS_OPER_VAR) : empty_string); }
static char *alias_version (void) { return m_strdup(internal_version); } static char *alias_version (void) { return m_strdup(internal_version); }
static char *alias_online (void) { return m_sprintf("%ld",(long)start_time); } static char *alias_online (void) { return m_sprintf("%ld",(long)start_time); }
static char *alias_idle (void) { return m_sprintf("%ld",now-idle_time); } static char *alias_idle (void) { return m_sprintf("%ld",(long)(now - idle_time)); }
static char *alias_show_userhost (void) { return m_strdup(get_server_userhost(from_server)); } static char *alias_show_userhost (void) { return m_strdup(get_server_userhost(from_server)); }
static char *alias_current_numeric (void) { return m_sprintf("%03d", -current_numeric); } static char *alias_current_numeric (void) { return m_sprintf("%03d", -current_numeric); }
static char *alias_hookname (void) { return m_sprintf("%s", *hook_name?hook_name:empty_string); } static char *alias_hookname (void) { return m_sprintf("%s", *hook_name?hook_name:empty_string); }
@@ -1104,7 +1104,7 @@ static char *alias_uptime (void) { return m_sprintf("%s", convert_time(now-star
static char *alias_bitchx (void) { return m_strdup("[BX]"); } static char *alias_bitchx (void) { return m_strdup("[BX]"); }
extern char *return_this_alias (void); extern char *return_this_alias (void);
static char *alias_thisaliasname (void) { return m_strdup(return_this_alias()); } static char *alias_thisaliasname (void) { return m_strdup(return_this_alias()); }
static char *alias_serverlag (void) { return m_sprintf("%ld", get_server_lag(from_server)); } static char *alias_serverlag (void) { return m_sprintf("%d", get_server_lag(from_server)); }
static char *alias_currentwindow (void) { return m_sprintf("%d", current_window ? current_window->refnum : 0); } static char *alias_currentwindow (void) { return m_sprintf("%d", current_window ? current_window->refnum : 0); }
static char *alias_serverlistsize (void) { return m_sprintf("%d", server_list_size()); } static char *alias_serverlistsize (void) { return m_sprintf("%d", server_list_size()); }
@@ -1148,10 +1148,10 @@ static char *alias_server (void)
static char *alias_awaytime (void) static char *alias_awaytime (void)
{ {
return m_sprintf("%lu", parsing_server_index != -1 ? return m_sprintf("%ld", parsing_server_index != -1 ?
get_server_awaytime(parsing_server_index): (long)get_server_awaytime(parsing_server_index):
get_window_server(0) != -1 ? get_window_server(0) != -1 ?
get_server_awaytime(get_window_server(0)): (long)get_server_awaytime(get_window_server(0)):
0); 0);
} }
@@ -3515,7 +3515,7 @@ BUILT_IN_FUNCTION(function_serverpass, input)
if (servnum < 0 || servnum > server_list_size()) if (servnum < 0 || servnum > server_list_size())
RETURN_EMPTY; RETURN_EMPTY;
return m_sprintf("%d", get_server_pass(servnum)); return m_strdup(get_server_pass(servnum));
} }
BUILT_IN_FUNCTION(function_open, words) BUILT_IN_FUNCTION(function_open, words)
@@ -4386,7 +4386,7 @@ register UserList *tmp;
if (!uh || !*uh || !channel || !*channel) if (!uh || !*uh || !channel || !*channel)
RETURN_EMPTY; RETURN_EMPTY;
if ((tmp = find_bestmatch("*", uh, channel, NULL))) if ((tmp = find_bestmatch("*", uh, channel, NULL)))
return m_sprintf("%d %s %s %s", tmp->flags, tmp->host, tmp->channels, tmp->password?tmp->password:empty_string); return m_sprintf("%lu %s %s %s", tmp->flags, tmp->host, tmp->channels, tmp->password?tmp->password:empty_string);
#endif #endif
RETURN_EMPTY; RETURN_EMPTY;
} }
@@ -4820,7 +4820,7 @@ register ShitList *Shit;
else else
channel = "*"; channel = "*";
if ((User = lookup_userlevelc("*", uhost, channel, NULL))) if ((User = lookup_userlevelc("*", uhost, channel, NULL)))
return m_sprintf("USER %d %s %s", User->flags, User->host, User->channels); return m_sprintf("USER %lu %s %s", User->flags, User->host, User->channels);
if ((Shit = nickinshit(nick, uhost)) && check_channel_match(Shit->channels, channel)) if ((Shit = nickinshit(nick, uhost)) && check_channel_match(Shit->channels, channel))
return m_sprintf("SHIT %s %d %s", Shit->filter, Shit->level, Shit->channels); return m_sprintf("SHIT %s %d %s", Shit->filter, Shit->level, Shit->channels);
#endif #endif