j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Remove newlines at end of log messages.

Browse source
This commit is contained in:
Guus Sliepen 2012-09-04 14:21:50 +02:00
parent 05dac63dbc
commit e9de08be0d
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/logger.c
View file

@ -88,6 +88,7 @@ void reopenlogger() {
void logger(int level, int priority, const char *format, ...) { void logger(int level, int priority, const char *format, ...) {
va_list ap; va_list ap;
int len;
char timestr[32] = ""; char timestr[32] = "";
char message[1024] = ""; char message[1024] = "";
time_t now; time_t now;
@ -101,9 +102,12 @@ void logger(int level, int priority, const char *format, ...) {
return; return;
va_start(ap, format); va_start(ap, format);
vsnprintf(message, sizeof message, format, ap); len = vsnprintf(message, sizeof message, format, ap);
va_end(ap); va_end(ap);
if(len > 0 && len < sizeof message && message[len - 1] == '\n')
message[len - 1] = 0;
if(level <= debug_level) { if(level <= debug_level) {
switch(logmode) { switch(logmode) {
case LOGMODE_STDERR: case LOGMODE_STDERR:

4
src/net.c
View file

@ -344,7 +344,7 @@ int reload_configuration(void) {
for(node = myself->subnet_tree->head; node; node = node->next) { for(node = myself->subnet_tree->head; node; node = node->next) {
subnet_t *subnet = node->data; subnet_t *subnet = node->data;
logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d\n", subnet, (int)subnet->expires); logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d", subnet, (int)subnet->expires);
if(!subnet->expires) if(!subnet->expires)
subnet->expires = 1; subnet->expires = 1;
} }
@ -356,7 +356,7 @@ int reload_configuration(void) {
continue; continue;
if((s2 = lookup_subnet(myself, subnet))) { if((s2 = lookup_subnet(myself, subnet))) {
logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d\n", s2, (int)s2->expires); logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d", s2, (int)s2->expires);
if(s2->expires == 1) if(s2->expires == 1)
s2->expires = 0; s2->expires = 0;

4
src/net_socket.c
View file

@ -306,7 +306,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
int fd[2]; int fd[2];
if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) { if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not create socketpair: %s\n", strerror(errno)); logger(DEBUG_ALWAYS, LOG_ERR, "Could not create socketpair: %s", strerror(errno));
return; return;
} }
@ -339,7 +339,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
int result = system(command); int result = system(command);
if(result < 0) if(result < 0)
logger(DEBUG_ALWAYS, LOG_ERR, "Could not execute %s: %s\n", command, strerror(errno)); logger(DEBUG_ALWAYS, LOG_ERR, "Could not execute %s: %s", command, strerror(errno));
else if(result) else if(result)
logger(DEBUG_ALWAYS, LOG_ERR, "%s exited with non-zero status %d", command, result); logger(DEBUG_ALWAYS, LOG_ERR, "%s exited with non-zero status %d", command, result);
exit(result); exit(result);