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

- minor fixes and improvements

Browse Source
This commit is contained in:
zolliker
2008-02-13 09:59:23 +00:00
parent 327f595fa6
commit 217de95b29
5 changed files with 294 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ascon.c
View File

@ -57,7 +57,7 @@ double DoubleTime(void) {
return now.tv_sec + now.tv_usec / 1e6;
}
static void AsconError(AsconPtr a, char *msg, int errorno) {
static void AsconError(Ascon *a, char *msg, int errorno) {
static char *stateText[]={
"state 0", "kill", "state 2", "notConnected",
"connect", "start connect", "connect finished", "connect failed",
@ -80,7 +80,7 @@ static void AsconError(AsconPtr a, char *msg, int errorno) {
a->state |= AsconFailed;
}
static void AsconConnect(AsconPtr a) {
static void AsconConnect(Ascon *a) {
/* input state: AsconConnectStart
output state: AsconFailed or AsconConnecting */
int ret;
@ -124,7 +124,7 @@ static void AsconConnect(AsconPtr a) {
return;
}
void AsconStdInit(AsconPtr a, char *hostport) {
void AsconStdInit(Ascon *a, char *hostport) {
a->fd = -1;
a->state = AsconConnectStart;
a->timeout = 2.0; /* sec */
@ -245,7 +245,7 @@ int AsconWriteChars(int fd, char *data, int length) {
static double lastCall = 0;
int AsconStdHandler(AsconPtr a) {
int AsconStdHandler(Ascon *a) {
int ret;
int l;
char chr;
@ -354,7 +354,7 @@ void AsconInsertProtocol(AsconProtocol *protocol) {
AsconProtocolAdd(&protocols, protocol);
}
AsconHandler AsconSetHandler(AsconPtr a, int argc, char *argv[]) {
AsconHandler AsconSetHandler(Ascon *a, int argc, char *argv[]) {
AsconProtocol *p;
if (argc < 1) return NULL;
@ -378,8 +378,8 @@ char *ConcatArgs(int argc, char *argv[]) {
return Arg2Tcl(argc, argv, NULL, -1);
}
AsconPtr AsconMake(SConnection *con, int argc, char *argv[]) {
AsconPtr a;
Ascon *AsconMake(SConnection *con, int argc, char *argv[]) {
Ascon *a;
char *args;
a = calloc(1, sizeof(*a));
@ -402,7 +402,7 @@ AsconPtr AsconMake(SConnection *con, int argc, char *argv[]) {
return a;
}
void AsconKill(AsconPtr a) {
void AsconKill(Ascon *a) {
a->state = AsconKillMe;
a->handler(a);
if (a->fd > 0) {
@ -416,7 +416,7 @@ void AsconKill(AsconPtr a) {
free(a);
}
AsconStatus AsconTask(AsconPtr a) {
AsconStatus AsconTask(Ascon *a) {
a->handler(a);
while (1) {
switch (a->state) {
@ -462,7 +462,7 @@ AsconStatus AsconTask(AsconPtr a) {
}
}
int AsconWrite(AsconPtr a, char *command, int noResponse) {
int AsconWrite(Ascon *a, char *command, int noResponse) {
if (a->state <= AsconConnectFailed || a->state % 4 < AsconFinished) return 0;
DynStringCopy(a->wrBuffer, command);
a->noResponse = noResponse;
@ -472,7 +472,7 @@ int AsconWrite(AsconPtr a, char *command, int noResponse) {
return 1;
}
char *AsconRead(AsconPtr a) {
char *AsconRead(Ascon *a) {
if (a->noResponse) {
a->noResponse=0;
return "";
@ -488,6 +488,6 @@ char *AsconRead(AsconPtr a) {
return NULL;
}
ErrMsgList *AsconGetErrList(AsconPtr a) {
ErrMsgList *AsconGetErrList(Ascon *a) {
return &a->errList;
}