mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-06 13:50:28 +00:00
Code Issues Releases Wiki Activity

fix ngt_TrimStr(), fix format string

Browse Source
This commit is contained in:
Florian Westphal 2006-03-24 23:25:38 +00:00
parent cba9270845
commit bebfbedf3f
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ngircd/client.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: client.c,v 1.89 2006/03/11 10:43:49 fw Exp $"; static char UNUSED id[] = "$Id: client.c,v 1.90 2006/03/24 23:25:38 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -321,11 +321,9 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
{ {
if( c->id[0] ) Log( LOG_NOTICE, "Client \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt ); if( c->id[0] ) Log( LOG_NOTICE, "Client \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
else Log( LOG_NOTICE, "Client unregistered (connection %d): %s", c->conn_id, txt ); else Log( LOG_NOTICE, "Client unregistered (connection %d): %s", c->conn_id, txt );
} } else {
else Log(LOG_WARNING, "Unregistered unknown client \"%s\": %s",
{ c->id[0] ? c->id : "(No Nick)", txt );
if( c->id[0] ) Log( LOG_WARNING, "Unregistered unknown client \"%s\": %s", c->id, txt );
else Log( LOG_WARNING, "Unregistered unknown client: %s", c->id, txt );
} }
} }

11
src/tool/tool.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: tool.c,v 1.4 2006/03/22 08:05:10 alex Exp $"; static char UNUSED id[] = "$Id: tool.c,v 1.5 2006/03/24 23:25:39 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -43,16 +43,21 @@ ngt_TrimStr(char *String)
while (*start == ' ' || *start == '\t') while (*start == ' ' || *start == '\t')
start++; start++;
if (!*start) {
*String = 0;
return;
}
/* ... and at the end: */ /* ... and at the end: */
end = strchr(start, '\0'); end = strchr(start, '\0');
end--;
while ((*end == ' ' || *end == '\t' || *end == '\n' || *end == '\r') while ((*end == ' ' || *end == '\t' || *end == '\n' || *end == '\r')
&& end >= start) && end > start)
end--; end--;
/* New trailing NULL byte */ /* New trailing NULL byte */
*(++end) = '\0'; *(++end) = '\0';
memmove(String, start, (size_t)(end - start)); memmove(String, start, (size_t)(end - start)+1);
} /* ngt_TrimStr */ } /* ngt_TrimStr */