Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
Conflicts: fourmess.c
This commit is contained in:
2
nread.c
2
nread.c
@@ -1355,7 +1355,7 @@ static int TelnetAcceptCB(int handle, void *userData)
|
||||
/*------------------------------------------------------------------------------------*/
|
||||
static void NREADlog(int level, char *txt, void *userData)
|
||||
{
|
||||
traceSys("anet",txt);
|
||||
traceSys("anet","%s",txt);
|
||||
SICSLogWrite(txt, (level == ANETERROR) ? eLogError : eLog);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user