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

Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sicspsi

Browse Source 
Conflicts:
	binprot.c
	pardef.c
This commit is contained in:
koennecke
2015-07-07 12:36:11 +02:00
parent 0294b7ad95 900e2771fc
commit 4d5468458b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arrobj.c
View File

@ -25,6 +25,7 @@ typedef struct {
ParData p; ParData p;
ArrayItem *items, *freeItems; ArrayItem *items, *freeItems;
char *saveFile; char *saveFile;
int logged;
} ArrayObj; } ArrayObj;
static ParClass arrayObjClass = { "array", sizeof(ArrayObj) }; static ParClass arrayObjClass = { "array", sizeof(ArrayObj) };
@ -280,6 +281,9 @@ static void ArrayObjParDef(void *object)
} }
} }
ParName(item->name); ParName(item->name);
if (!arr->logged) {
ParLogAs(NULL);
}
ParSave(2); ParSave(2);
ParAccess(usUser); ParAccess(usUser);
if (item->unit) { if (item->unit) {
@ -346,6 +350,11 @@ static int ArrayObjInit(SConnection * con, int argc, char *argv[],
creationCmd = Arg2Tcl(argc, argv, NULL, 0); creationCmd = Arg2Tcl(argc, argv, NULL, 0);
} }
arr = ParMake(con, argv[1], &arrayObjClass, ArrayObjParDef, creationCmd); arr = ParMake(con, argv[1], &arrayObjClass, ArrayObjParDef, creationCmd);
if (argc > 2 && strcasecmp(argv[2], "logged") == 0) {
arr->logged = 1;
} else {
arr->logged = 0;
}
arr->freeItems = NULL; arr->freeItems = NULL;
arr->items = NULL; arr->items = NULL;
return arr != NULL; return arr != NULL;