1
0
mirror of https://github.com/anope/anope.git synced 2026-07-10 08:03:13 +02:00

Merge send_cmd() and vsend_cmd().

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1205 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-09-30 18:45:10 +00:00
parent b3df8dbfb1
commit ca8996472c
2 changed files with 19 additions and 38 deletions
-2
View File
@@ -1013,8 +1013,6 @@ E void process(void);
E void send_cmd(const char *source, const char *fmt, ...)
FORMAT(printf,2,3);
E void vsend_cmd(const char *source, const char *fmt, va_list args)
FORMAT(printf,2,0);
E void notice_server(char *source, Server * s, char *fmt, ...)
FORMAT(printf,3,4);
+19 -36
View File
@@ -26,46 +26,29 @@
*/
void send_cmd(const char *source, const char *fmt, ...)
{
va_list args;
va_list args;
static char buf[BUFSIZE];
if (fmt) {
va_start(args, fmt);
vsend_cmd(source, fmt, args);
va_end(args);
}
}
va_start(args, fmt);
/*************************************************************************/
vsnprintf(buf, BUFSIZE - 1, fmt, args);
/**
* actually Send a command to the server.
* @param source Orgin of the Message (some times NULL)
* @param fmt Format of the Message
* @param args List of the arguments
* @return void
*/
void vsend_cmd(const char *source, const char *fmt, va_list args)
{
char buf[BUFSIZE];
*buf = '\0';
if (source)
{
sockprintf(servsock, ":%s %s\r\n", source, buf);
eventprintf(":%s %s", source, buf);
if (debug)
alog("debug: Sent: :%s %s", source, buf);
}
else
{
sockprintf(servsock, "%s\r\n", buf);
eventprintf("%s", buf);
if (debug)
alog("debug: Sent: %s", buf);
}
if (fmt) {
vsnprintf(buf, BUFSIZE - 1, fmt, args);
if (source) {
sockprintf(servsock, ":%s %s\r\n", source, buf);
eventprintf(":%s %s", source, buf);
if (debug) {
alog("debug: Sent: :%s %s", source, buf);
}
} else {
sockprintf(servsock, "%s\r\n", buf);
eventprintf("%s", buf);
if (debug) {
alog("debug: Sent: %s", buf);
}
}
}
va_end(args);
}
/*************************************************************************/