- Adapted indenation to new agreed upon system

- Added support for second generation scriptcontext based counter

obdes.c

@@ -47,160 +47,165 @@
 #include "hipadaba.h"
 
 /*-------------------------------------------------------------------------*/
-  static void *DefaultGetInterface(void *pData,int iID)
-  {
+static void *DefaultGetInterface(void *pData, int iID)
+{
+  return NULL;
+}
+
+/*-------------------------------------------------------------------------*/
+static int DefaultSave(void *self, char *name, FILE * fd)
+{
+  return 1;
+}
+
+/*--------------------------------------------------------------------------*/
+pObjectDescriptor CreateDescriptor(char *name)
+{
+  pObjectDescriptor pRes = NULL;
+
+  pRes = (pObjectDescriptor) malloc(sizeof(ObjectDescriptor));
+  if (!pRes) {
     return NULL;
   }
-/*-------------------------------------------------------------------------*/
-  static int DefaultSave(void *self, char *name,FILE *fd)
-  {
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  pObjectDescriptor CreateDescriptor(char *name)
-  {
-     pObjectDescriptor pRes = NULL;
-     
-     pRes = (pObjectDescriptor)malloc(sizeof(ObjectDescriptor));
-     if(!pRes)
-     {
-       return NULL;
-     }
-     pRes->name = strdup(name);
-     pRes->pKeys = NULL;
-     pRes->parNode = NULL;
-     pRes->SaveStatus = DefaultSave;
-     pRes->GetInterface = DefaultGetInterface;
-     return pRes;
-  }
+  pRes->name = strdup(name);
+  pRes->pKeys = NULL;
+  pRes->parNode = NULL;
+  pRes->SaveStatus = DefaultSave;
+  pRes->GetInterface = DefaultGetInterface;
+  return pRes;
+}
+
 /*---------------------------------------------------------------------------*/
-  void DeleteDescriptor(pObjectDescriptor self)
-  {
-    assert(self);
-    if(self->name) free(self->name);
-    if(self->pKeys) IFDeleteOptions(self->pKeys);
-    /*
-     * delate a parameter node only when not linked elsewhere
-     */
-    if(self->parNode != NULL){
-        if(self->parNode->mama == NULL){
-            DeleteHipadabaNode(self->parNode,NULL);
-        }
+void DeleteDescriptor(pObjectDescriptor self)
+{
+  assert(self);
+  if (self->name)
+    free(self->name);
+  if (self->pKeys)
+    IFDeleteOptions(self->pKeys);
+  /*
+   * delate a parameter node only when not linked elsewhere
+   */
+  if (self->parNode != NULL) {
+    if (self->parNode->mama == NULL) {
+      DeleteHipadabaNode(self->parNode, NULL);
     }
-    free(self);
-  
   }
+  free(self);
+
+}
+
 /*-------------------------------------------------------------------------*/
-  pDummy CreateDummy(char *name)
-  {
-    pDummy pRes = NULL;
-    
-    pRes = (pDummy)malloc(sizeof(Dummy));
-    if(!pRes)
-    {
-      SICSLogWrite("Out of Memory  in CreateDummy",eInternal);
-      return NULL;
-    }
-    
-    pRes->pDescriptor  = CreateDescriptor(name);
-    if(!pRes->pDescriptor)
-    {
-      free(pRes);
-      SICSLogWrite("Out of Memory  in CreateDummy",eInternal);
-      return NULL;
-    }
-    return pRes;
+pDummy CreateDummy(char *name)
+{
+  pDummy pRes = NULL;
+
+  pRes = (pDummy) malloc(sizeof(Dummy));
+  if (!pRes) {
+    SICSLogWrite("Out of Memory  in CreateDummy", eInternal);
+    return NULL;
   }
+
+  pRes->pDescriptor = CreateDescriptor(name);
+  if (!pRes->pDescriptor) {
+    free(pRes);
+    SICSLogWrite("Out of Memory  in CreateDummy", eInternal);
+    return NULL;
+  }
+  return pRes;
+}
+
 /*--------------------------------------------------------------------------*/
-  void KillDummy(void *pData)
-  {
-    pDummy pVictim;
-   
-    if(!pData)return; 
-   
-    pVictim = (pDummy)pData;
-    if(pVictim->pDescriptor)
-    {
-      DeleteDescriptor(pVictim->pDescriptor);
-    }
-    free(pData);
+void KillDummy(void *pData)
+{
+  pDummy pVictim;
+
+  if (!pData)
+    return;
+
+  pVictim = (pDummy) pData;
+  if (pVictim->pDescriptor) {
+    DeleteDescriptor(pVictim->pDescriptor);
   }
+  free(pData);
+}
+
 /*-------------------------------------------------------------------------*/
-  int iHasType(void *pData, char *Type)
-  {
-      pDummy pTest;
-      
-      assert(pData);
-      pTest = (pDummy)pData;
-      if(!pTest->pDescriptor)
-      {
-        return 0;
-      }
-      if(strcmp(pTest->pDescriptor->name,Type) == 0)
-      {
-        return 1;
-      }
-      return 0;
+int iHasType(void *pData, char *Type)
+{
+  pDummy pTest;
+
+  assert(pData);
+  pTest = (pDummy) pData;
+  if (!pTest->pDescriptor) {
+    return 0;
   }
+  if (strcmp(pTest->pDescriptor->name, Type) == 0) {
+    return 1;
+  }
+  return 0;
+}
+
 /*------------------------------------------------------------------------*/
-  pObjectDescriptor FindDescriptor(void *pData)
-  {
-    pDummy pDum = NULL;
-    
-    assert(pData);
-    pDum = (pDummy)pData;
-    return pDum->pDescriptor;
-  }
+pObjectDescriptor FindDescriptor(void *pData)
+{
+  pDummy pDum = NULL;
+
+  assert(pData);
+  pDum = (pDummy) pData;
+  return pDum->pDescriptor;
+}
+
 /*--------------------------------------------------------------------------*/
-  void SetDescriptorKey(pObjectDescriptor self, char *keyName, char *eltValue)
-  {
-    if(NULL!=self)
-    {
-        self->pKeys = IFSetOption(self->pKeys,keyName,eltValue);    
-    }
+void SetDescriptorKey(pObjectDescriptor self, char *keyName,
+                      char *eltValue)
+{
+  if (NULL != self) {
+    self->pKeys = IFSetOption(self->pKeys, keyName, eltValue);
   }
+}
+
 /*--------------------------------------------------------------------------*/
-  void SetDescriptorGroup(pObjectDescriptor self, char *group)
-  {
-    if(NULL==self)
-    {
-        return;
-    }
-    self->pKeys = IFSetOption(self->pKeys,"group",group);
+void SetDescriptorGroup(pObjectDescriptor self, char *group)
+{
+  if (NULL == self) {
+    return;
   }
+  self->pKeys = IFSetOption(self->pKeys, "group", group);
+}
+
 /*--------------------------------------------------------------------------*/
-  void SetDescriptorDescription(pObjectDescriptor self, char *description)
-  {
-    if(NULL==self)
-    {
-        return;
-    }
-    self->pKeys = IFSetOption(self->pKeys,"description", description);
+void SetDescriptorDescription(pObjectDescriptor self, char *description)
+{
+  if (NULL == self) {
+    return;
   }
+  self->pKeys = IFSetOption(self->pKeys, "description", description);
+}
+
   /*--------------------------------------------------------------------------*/
-  char * GetDescriptorKey(pObjectDescriptor self, char *keyName)
-  {
-    if(NULL==self)
-    {
-        return NULL;
-    }
-    return IFindOption(self->pKeys,keyName);
+char *GetDescriptorKey(pObjectDescriptor self, char *keyName)
+{
+  if (NULL == self) {
+    return NULL;
   }
+  return IFindOption(self->pKeys, keyName);
+}
+
 /*--------------------------------------------------------------------------*/
-  char * GetDescriptorGroup(pObjectDescriptor self)
-  {
-    if(NULL==self)
-    {
-        return NULL;
-    }
-    return IFindOption(self->pKeys,"group");
+char *GetDescriptorGroup(pObjectDescriptor self)
+{
+  if (NULL == self) {
+    return NULL;
   }
+  return IFindOption(self->pKeys, "group");
+}
+
 /*--------------------------------------------------------------------------*/
-  char *GetDescriptorDescription(pObjectDescriptor self)
-  {
-    if(NULL==self)
-    {
-        return NULL;
-    }
-    return IFindOption(self->pKeys,"description");
+char *GetDescriptorDescription(pObjectDescriptor self)
+{
+  if (NULL == self) {
+    return NULL;
   }
+  return IFindOption(self->pKeys, "description");
+}