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

- Fixed sicsprompt bug. Sicsprompt caused a core dump

Browse Source 
- 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:
koennecke
2012-06-05 09:09:20 +00:00
parent ecd96f9ab0
commit bd50b19178
21 changed files with 238 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nxdict.c
View File

@ -553,7 +553,7 @@ typedef struct {
int iTerminal;
} ParDat;
static void DummyError(void *pData, char *pError)
static void DummyError(void *p, char *pError)
{
return;
}
@ -720,9 +720,9 @@ static void NXDIAttValue(ParDat * sStat)
int NXDIParsePath(NXhandle hfil, ParDat * pParse)
{
int iRet, iToken;
void (*ErrFunc) (void *pData, char *pErr);
char pName[132], pClass[132];
char pError[256];
void *pData = NULL;
/* get the name */
NXDIDefToken(pParse); /* next token */
@ -760,12 +760,11 @@ int NXDIParsePath(NXhandle hfil, ParDat * pParse)
strcpy(pClass, pParse->pToken);
/* done reading, ACTION, first install dummy error handler */
ErrFunc = NXIReportError;
NXMSetError(NXpData,DummyError);
NXMDisableErrorReporting();
/* try opening vGroup */
iRet = NXopengroup(hfil, pName, pClass);
NXMSetError(NXpData,ErrFunc);
NXMEnableErrorReporting();
if (iRet == NX_OK) {
pParse->iDepth++;
return NX_OK;
@ -960,7 +959,6 @@ static int NXDIParseSDS(NXhandle hfil, ParDat * pParse)
int iRet, iStat, i;
char pError[256];
char pName[NX_MAXNAMELEN];
void (*ErrFunc) (void *pData, char *pErr);
AttItem sAtt;
@ -1061,12 +1059,11 @@ static int NXDIParseSDS(NXhandle hfil, ParDat * pParse)
/* first install dummy error handler, try open it, then
deinstall again and create if allowed
*/
ErrFunc = NXIReportError;
NXMSetError(NXpData, DummyError);
NXMDisableErrorReporting();
/* try opening SDS */
iRet = NXopendata(hfil, pName);
NXMSetError(NXpData, ErrFunc);
NXMEnableErrorReporting();
if (iRet == NX_OK) {
LLDdelete(iList);
return NX_OK;
@ -1687,16 +1684,15 @@ NXstatus NXUwriteglobals(NXhandle pFile,
/*-----------------------------------------------------------------------*/
NXstatus NXUentergroup(NXhandle hFil, char *name, char *class)
{
void (*ErrFunc) (void *pData, char *pErr);
int iRet;
/* ACTION, first install dummy error handler */
ErrFunc = NXIReportError;
NXMSetError(NXpData, DummyError);
NXMDisableErrorReporting();
/* try opening vGroup */
iRet = NXopengroup(hFil, name, class);
NXMSetError(NXpData, ErrFunc);
NXMEnableErrorReporting();
if (iRet == NX_OK) {
return NX_OK;
} else {
@ -1719,16 +1715,14 @@ NXstatus NXUentergroup(NXhandle hFil, char *name, char *class)
NXstatus NXUenterdata(NXhandle hFil, char *label, int datatype,
int rank, int dim[], char *pUnits)
{
void (*ErrFunc) (void *pData, char *pErr);
int iRet;
/* ACTION, first install dummy error handler */
ErrFunc = NXIReportError;
NXMSetError(NXpData, DummyError);
NXMDisableErrorReporting();
/* try opening SDS */
iRet = NXopendata(hFil, label);
NXMSetError(NXpData, ErrFunc);
NXMEnableErrorReporting();
if (iRet == NX_OK) {
return NX_OK;
} else {