merge develop

common/config/config_load_configmodule.c

@@ -182,8 +182,8 @@ int config_cmdlineonly_get(paramdef_t *cfgoptions,int numoptions, char *prefix )
 }
 
 configmodule_interface_t *load_configmodule(int argc,
-		                                    char **argv,
-											uint32_t initflags)
+					    char **argv,
+					    uint32_t initflags)
 {
   char *cfgparam=NULL;
   char *modeparams=NULL;
@@ -194,6 +194,11 @@ configmodule_interface_t *load_configmodule(int argc,
   int i;
   int OoptIdx=-1;
 
+  printf("CMDLINE: ");
+  for (int i=0; i<argc; i++)
+    printf("\"%s\" ", argv[i]);
+  printf("\n");
+
   /* first parse the command line to look for the -O option */
   for (i = 0; i<argc; i++) {
     if (strlen(argv[i]) < 2)

common/config/libconfig/config_libconfig.c

@@ -122,7 +122,7 @@ int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
 
     switch(cfgoptions[i].type) {
       case TYPE_STRING:
-        if ( config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
+        if ( config_lookup_string(&(libconfig_privdata.cfg), cfgpath, (const char**)&str)) {
           if ( cfgoptions[i].numelt > 0  && str != NULL && strlen(str) >= cfgoptions[i].numelt ) {
             fprintf(stderr,"[LIBCONFIG] %s:  %s exceeds maximum length of %i bytes, value truncated\n",
                     cfgpath,str,cfgoptions[i].numelt);