Changeset 425 for WizardsToolkit/trunk

Timestamp:

10/21/09 10:57:50 (5 weeks ago)

Author:

cristy

Message:

 

Location:

WizardsToolkit/trunk/wizard

Files:

• configure.c (modified) (6 diffs)
• configure.h (modified) (1 diff)

WizardsToolkit/trunk/wizard/configure.c

@@ -61 +61 @@
 
 /*
+  Typedef declarations.
+*/
+typedef struct _ConfigureMapInfo
+{
+  const char
+    *name,
+    *value;
+} ConfigureMapInfo;
+
+/*
   Static declarations.
 */
-static const char
-  *ConfigureMap = (char *)
-    "<?xml version=\"1.0\"?>"
-    "<configuremap>"
-    "  <configure stealth=\"True\" />"
-    "</configuremap>";
+static const ConfigureMapInfo
+  ConfigureMap[] =
+  {
+  };
 
 static LinkedListInfo
@@ -112 +120 @@
 
   p=(ConfigureInfo *) configure_info;
-  if (p->path != (char *) NULL)
-    p->path=(char *) RelinquishWizardMemory(p->path);
-  if (p->name != (char *) NULL)
-    p->name=(char *) RelinquishWizardMemory(p->name);
-  if (p->value != (char *) NULL)
-    p->value=(char *) RelinquishWizardMemory(p->value);
+  if (p->exempt == WizardFalse)
+    {
+      if (p->value != (char *) NULL)
+        p->value=(char *) RelinquishWizardMemory(p->value);
+      if (p->name != (char *) NULL)
+        p->name=(char *) RelinquishWizardMemory(p->name);
+      if (p->path != (char *) NULL)
+        p->path=(char *) RelinquishWizardMemory(p->path);
+    }
   p=(ConfigureInfo *) RelinquishWizardMemory(p);
   return((void *) NULL);
@@ -989 +1000 @@
     (void) ResetWizardMemory(configure_info,0,sizeof(*configure_info));
     configure_info->path=ConstantString(filename);
+    configure_info->exempt=WizardFalse;
     configure_info->signature=WizardSignature;
     attribute=GetXMLTreeAttribute(configure,"name");
@@ -1038 +1050 @@
   ExceptionInfo *exception)
 {
-#if defined(WIZARDSTOOLKIT_EMBEDDABLE_SUPPORT)
-  return(LoadConfigureList(ConfigureMap,"built-in",0,exception));
-#else
   char
     path[MaxTextExtent];
@@ -1050 +1059 @@
     *options;
 
+  register long
+    i;
+
   WizardStatusType
     status;
 
+  /*
+    Load built-in configure map.
+  */
   status=WizardFalse;
+  if (configure_list == (LinkedListInfo *) NULL)
+    {
+      configure_list=NewLinkedList(0);
+      if (configure_list == (LinkedListInfo *) NULL)
+        {
+          ThrowFileException(exception,FileError,filename);
+          return(WizardFalse);
+        }
+    }
+  for (i=0; i < (long) (sizeof(ConfigureMap)/sizeof(*ConfigureMap)); i++)
+  {
+    ConfigureInfo
+      *configure_info;
+
+    register const ConfigureMapInfo
+      *p;
+
+    p=ConfigureMap+i;
+    configure_info=(ConfigureInfo *) AcquireWizardMemory(
+      sizeof(*configure_info));
+    if (configure_info == (ConfigureInfo *) NULL)
+      {
+        (void) ThrowWizardException(exception,GetWizardModule(),ResourceError,
+          "memory allocation failed `%s'",strerror(errno));
+        continue;
+      }
+    (void) ResetWizardMemory(configure_info,0,sizeof(*configure_info));
+    configure_info->path=(char *) "[built-in]";
+    configure_info->name=(char *) p->name;
+    configure_info->value=(char *) p->value;
+    configure_info->exempt=WizardTrue;
+    configure_info->signature=WizardSignature;
+    status=AppendValueToLinkedList(configure_list,configure_info);
+    if (status == WizardFalse)
+      (void) ThrowWizardException(exception,GetWizardModule(),ResourceError,
+        "memory allocation failed `%s'",strerror(errno));
+  }
+  /*
+    Load external configure map.
+  */
   *path='\0';
   options=GetConfigureOptions(filename,exception);
@@ -1065 +1120 @@
   }
   options=DestroyConfigureOptions(options);
-  if ((configure_list == (LinkedListInfo *) NULL) ||
-      (IsLinkedListEmpty(configure_list) != WizardFalse))
-    {
-      (void) ThrowWizardException(exception,GetWizardModule(),ConfigureWarning,
-        "unable to open configure file `%s'",path);
-      status|=LoadConfigureList(ConfigureMap,"built-in",0,exception);
-    }
   return(status != 0 ? WizardTrue : WizardFalse);
-#endif
-}
+}

WizardsToolkit/trunk/wizard/configure.h

@@ -33 +33 @@
                                                                                 
   WizardBooleanType
+    exempt,
     stealth;