- Fixed sicsprompt bug. Sicsprompt caused a core dump
- Removed generation of incommenurate reflections for 0,0,0 in fourmess.c - Implemented a Poch command for heartbeats - Fixed 64 bit dimension issues in nxdict - Fixed different calling conventions for NXReportError deep stack in nxdict - Stopped ei motor driving when not necessary - Added yet another monitor for POLDI - Added a protocoll driver for the JVL motor RS-485 binary protocoll - Fixed some reporting issues SKIPPED: psi/jvlprot.c psi/make_gen psi/polterwrite.c psi/psi.c psi/spss7.c
This commit is contained in:
45
macro.c
45
macro.c
@@ -728,7 +728,52 @@ int ClientPut(SConnection * pCon, SicsInterp * pInter, void *pData,
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
/*-----------------------------------------------------------------
|
||||
ClientLog writes to the socket and the command log only
|
||||
-------------------------------------------------------------------*/
|
||||
int ClientLog(SConnection * pCon, SicsInterp * pInter, void *pData,
|
||||
int argc, char *argv[])
|
||||
{
|
||||
OutCode eOut = eLog;
|
||||
int i = 0, iLen;
|
||||
char *pMessage = NULL;
|
||||
|
||||
assert(pCon);
|
||||
assert(pInter);
|
||||
|
||||
if (argc < 2) {
|
||||
SCWrite(pCon, "Insufficient arguments to ClientLog", eError);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* recombine the message */
|
||||
/* find length */
|
||||
iLen = 0;
|
||||
for (i = 1; i < argc; i++) {
|
||||
iLen += strlen(argv[i]);
|
||||
}
|
||||
pMessage = (char *) malloc((iLen + 100) * sizeof(char));
|
||||
if (!pMessage) {
|
||||
SCWrite(pCon, "ERROR: out of memory in clientlo", eLogError);
|
||||
return 0;
|
||||
}
|
||||
memset(pMessage, 0, (iLen + 100) * sizeof(char));
|
||||
Arg2Text(argc - 1, &argv[1], pMessage, (iLen + 100) * sizeof(char));
|
||||
|
||||
SCLogWrite(pCon,pMessage, eError);
|
||||
free(pMessage);
|
||||
return 1;
|
||||
}
|
||||
/*-----------------------------------------------------------------------
|
||||
A heartbeat command .............
|
||||
------------------------------------------------------------------------*/
|
||||
int Poch(SConnection * pCon, SicsInterp * pInter, void *pData,
|
||||
int argc, char *argv[])
|
||||
{
|
||||
SCPureSockWrite(pCon,"Poch", eLog);
|
||||
return 1;
|
||||
}
|
||||
/*-----------------------------------------------------------------------*/
|
||||
int GumPut(SConnection * pCon, SicsInterp * pInter, void *pData,
|
||||
int argc, char *argv[])
|
||||
|
||||
Reference in New Issue
Block a user