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

Cleaned up ANSTO code to merge with sinqdev.sics

Browse Source 
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h
This commit is contained in:
Ferdi Franceschini
2015-04-23 20:49:26 +10:00
parent c650788a2c
commit 10d29d597c
1336 changed files with 9430 additions and 226646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sicslist.c
View File

@ -25,9 +25,9 @@ static void listAllObjects(SConnection * pCon, SicsInterp * pSics)
while (pCom != NULL) {
Tcl_DStringAppend(&lst, pCom->pName, -1);
pCom = pCom->pNext;
Tcl_DStringAppend(&lst, " ", -1); //ffr "," -> " "
Tcl_DStringAppend(&lst, ",", -1);
}
Tcl_DStringAppend(&lst, " ", -1);
Tcl_DStringAppend(&lst, "ENDLIST", -1);
SCWrite(pCon, Tcl_DStringValue(&lst), eValue);
Tcl_DStringFree(&lst);
}
@ -79,7 +79,7 @@ static void listAllObjectData(SConnection * pCon, char *name, pDummy data)
prop = prop->pNext;
}
}
Tcl_DStringAppend(&lst, " ", -1);
Tcl_DStringAppend(&lst, "ENDLIST", -1);
SCWrite(pCon, Tcl_DStringValue(&lst), eValue);
Tcl_DStringFree(&lst);
}
@ -215,7 +215,7 @@ static void listToString(int list, Tcl_DString * txt)
pPtr = (char *) LLDnodePtr(list);
if (pPtr != NULL) {
Tcl_DStringAppend(txt, pPtr, -1);
Tcl_DStringAppend(txt, " ", -1); //ffr "," -> " "
Tcl_DStringAppend(txt, ",", -1);
}
status = LLDnodePtr2Next(list);
}
@ -246,7 +246,7 @@ static void printKeyTypes(SicsInterp * pSics, SConnection * pCon,
}
pCom = pCom->pNext;
}
LLDstringAppend(list, " ");
LLDstringAppend(list, "ENDLIST");
listToString(list, &result);
SCWrite(pCon, Tcl_DStringValue(&result), eValue);
@ -283,11 +283,11 @@ static void printObjectsMatchingKeyVal(SicsInterp * pSics,
}
if (status == 1) {
Tcl_DStringAppend(&result, pCom->pName, -1);
Tcl_DStringAppend(&result, " ", -1); //ffr "," -> " "
Tcl_DStringAppend(&result, ",", -1);
}
pCom = pCom->pNext;
}
Tcl_DStringAppend(&result, " ", -1);
Tcl_DStringAppend(&result, "ENDLIST", -1);
SCWrite(pCon, Tcl_DStringValue(&result), eValue);
Tcl_DStringFree(&result);
}
@ -407,7 +407,7 @@ static int printServer(SConnection * pCon)
Tcl_DStringAppend(&txt, buffer, -1);
current = current->pNext;
}
Tcl_DStringAppend(&txt, " ", -1);
Tcl_DStringAppend(&txt, "ENDLIST", -1);
SCWrite(pCon, Tcl_DStringValue(&txt), eValue);
Tcl_DStringFree(&txt);
return 1;
@ -477,11 +477,11 @@ static void printMatch(SConnection * pCon, SicsInterp * pSics, char *mask)
while (current != NULL) {
if (!match(mask, current->pName)) {
Tcl_DStringAppend(&txt, current->pName, -1);
Tcl_DStringAppend(&txt, " ", -1); //ffr "," -> " "
Tcl_DStringAppend(&txt, ",", -1);
}
current = current->pNext;
}
Tcl_DStringAppend(&txt, " ", -1);
Tcl_DStringAppend(&txt, "ENDLIST", -1);
SCWrite(pCon, Tcl_DStringValue(&txt), eValue);
Tcl_DStringFree(&txt);
}