Changeset 283

Timestamp:

Jul 27, 2011, 4:44:53 AM (13 years ago)

Author:

djay

Message:

Fix XML validation when only Default node is provided in the ZCFG file.

Location:

trunk/zoo-kernel

Files:

• service_internal.c (modified) (1 diff)
• zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-kernel/service_internal.c

@@ -1036 +1036 @@
 
     _tmp=e->supported;
-    if(_tmp==NULL && datatype==0)
+    if(_tmp==NULL)
       _tmp=e->defaults;
 

trunk/zoo-kernel/zoo_service_loader.c

@@ -1165 +1165 @@
             fprintf(stderr,"REFERENCE\n");
 #endif
-            const char *refs[5];
-            refs[0]="mimeType";
-            refs[1]="encoding";
-            refs[2]="schema";
-            refs[3]="method";
-            refs[4]="href";
+            const char *refs[5]={"mimeType","encoding","schema","method","href"};
             for(int l=0;l<5;l++){
 #ifdef DEBUG
@@ -1530 +1525 @@
          * storeExecuteResponse, lineage, status
          */
-        const char *ress[3];
-        ress[0]="storeExecuteResponse";
-        ress[1]="lineage";
-        ress[2]="status";
+        const char *ress[3]={"storeExecuteResponse","lineage","status"};
         xmlChar *val;
         for(int l=0;l<3;l++){
@@ -1604 +1596 @@
              * mimeType, encoding, schema, uom, asReference
              */
-            const char *outs[5];
-            outs[0]="mimeType";
-            outs[1]="encoding";
-            outs[2]="schema";
-            outs[3]="uom";
-            outs[4]="asReference";
+            const char *outs[5]={"mimeType","encoding","schema","uom","asReference"};
             for(int l=0;l<5;l++){
 #ifdef DEBUG