linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Browse Source
This commit is contained in:
zolliker
2015-04-28 16:24:39 +02:00
parent fb7741178d e8df6158ea
commit 55750450a5
95 changed files with 4011 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ascon.c
View File

@ -84,6 +84,8 @@ void AsconError(Ascon *a, char *msg, int errorno)
DynStringConcat(a->errmsg, " (");
DynStringConcat(a->errmsg, state);
DynStringConcat(a->errmsg, " state)");
DynStringConcat(a->errmsg, " on ");
DynStringConcat(a->errmsg, a->hostport);
} else {
DynStringConcat(a->errmsg, strerror(errorno));
DynStringConcat(a->errmsg, " (");
@ -91,6 +93,8 @@ void AsconError(Ascon *a, char *msg, int errorno)
DynStringConcat(a->errmsg, " state, ");
DynStringConcat(a->errmsg, msg);
DynStringConcat(a->errmsg, ")");
DynStringConcat(a->errmsg, " on ");
DynStringConcat(a->errmsg, a->hostport);
}
a->state = AsconFailed;
}
@ -818,7 +822,7 @@ char *AsconRead(Ascon * a)
{
if (a->noResponse) {
a->noResponse = 0;
return "";
return NULL;
}
if (a->state != AsconIdle) {
a->state = AsconIdle;