- Added SicsList

- Removed group and description attributes from ObjectDescriptor


SKIPPED:
	psi/dornier2.c
	psi/libpsi.a
	psi/make_gen
	psi/makefile_linux
	psi/pimotor.c
	psi/pipiezo.c
	psi/psi.c
	psi/serial.c
	psi/sinqhttp.c
	psi/sinqhttp.h
	psi/tcpdornier.c
	psi/velodornier.c
This commit is contained in:
koennecke
2006-01-16 08:32:07 +00:00
parent b3138f1197
commit 45fd50265f
20 changed files with 732 additions and 243 deletions

22
obdes.c
View File

@ -67,8 +67,6 @@
}
pRes->name = strdup(name);
pRes->pKeys = NULL;
pRes->description = NULL;
pRes->group = NULL;
pRes->SaveStatus = DefaultSave;
pRes->GetInterface = DefaultGetInterface;
return pRes;
@ -78,8 +76,6 @@
{
assert(self);
if(self->name) free(self->name);
if(self->description) free(self->description);
if(self->group) free(self->group);
if(self->pKeys) IFDeleteOptions(self->pKeys);
free(self);
@ -160,11 +156,7 @@
{
return;
}
if(NULL != self->group)
{
free(self->group);
}
self->group = strdup(group);
IFSetOption(self->pKeys,"group",group);
}
/*--------------------------------------------------------------------------*/
void SetDescriptorDescription(pObjectDescriptor self, char *description)
@ -173,11 +165,7 @@
{
return;
}
if(NULL != self->description)
{
free(self->description);
}
self->description = strdup(description);
IFSetOption(self->pKeys,"description", description);
}
/*--------------------------------------------------------------------------*/
char * GetDescriptorKey(pObjectDescriptor self, char *keyName)
@ -195,14 +183,14 @@
{
return NULL;
}
return self->group;
return IFindOption(self->pKeys,"group");
}
/*--------------------------------------------------------------------------*/
char * GetDescriptorDescription(pObjectDescriptor self)
char *GetDescriptorDescription(pObjectDescriptor self)
{
if(NULL==self)
{
return NULL;
}
return self->description;
return IFindOption(self->pKeys,"description");
}