2
0
Fork 0

small cleanup in config parser; small fix in log.c

personal/stbuehler/wip
Thomas Porzelt 2008-08-14 15:52:45 +02:00
parent 1ab2d0d6b3
commit c1bc3b8e0a
2 changed files with 3 additions and 3 deletions

View File

@ -702,11 +702,11 @@
# scanner
value_scanner := ( value (any - value - ws) >keyvalue_end );
block_scanner := ( (noise | comment | statement)* '}' >block_end );
block_scanner := ( (noise | statement)* '}' >block_end );
list_scanner := ( noise* (value %list_push (noise* ',' noise* value %list_push)*)? noise* ')' >list_end );
hash_scanner := ( noise* (hash_elem %hash_push (noise* ',' noise* hash_elem %hash_push)*)? noise* ']' >hash_end );
main := (noise | comment | statement)* '\00';
main := (noise | statement)* '\00';
}%%
%% write data;

View File

@ -74,7 +74,7 @@ gboolean log_write_(server *srv, connection *con, log_level_t log_level, const g
}
}
g_string_assign(log->lastmsg, log_line->str);
log->lastmsg = g_string_assign(log->lastmsg, log_line->str);
g_string_append_len(log_line, CONST_STR_LEN("\r\n"));