Merge branch 'maverick' into develop

Compile under OSX

chadapter.c

@@ -3,7 +3,7 @@
 
   This is a drivable adapter for the ChopperController object (or also generic
   controller object). It allows to modify one of the variables supported by
-  the controller through the normal SICS drive command. For more information 
+  the controller through the normal SICS drive command. For more information
   see file choco.w or choco.tex.
 
 
@@ -174,8 +174,9 @@ static void KillAdapter(void *pData)
   if (self->pInt)
     free(self->pInt);
 
-  if (self->pParName)
+  if (self->pParName){
     free(self->pParName);
+  }
 
   free(self);
 }
@@ -302,7 +303,7 @@ int CHAdapterAction(SConnection * pCon, SicsInterp * pSics, void *pData,
 }
 
 /*=========================================================================
-  An environment driver based on top of a controller object. 
+  An environment driver based on top of a controller object.
   -------------------------------------------------------------------------*/
 static int AVEVSetValue(pEVDriver self, float fNew)
 {
@@ -429,7 +430,7 @@ pEVDriver MakeControllerEnvironmentDriver(int argc, char *argv[])
   pDummy pDum = NULL;
   pChoco pChop;
 
-  /* 
+  /*
      Two arguments are needed: the name of the controller and the
      name of the parameter
    */
@@ -449,7 +450,7 @@ pEVDriver MakeControllerEnvironmentDriver(int argc, char *argv[])
   }
 
   /* alright: I think we got a controller now, let us create our
-     act 
+     act
    */
   pNew = CreateEVDriver(argc, argv);
   if (!pNew) {