Changeset 2106

Timestamp:

03/30/08 22:55:55 (2 months ago)

Author:

karpet

Message:

test that all ids are unique

Files:

• libswish3/trunk/src/libswish3/config.c (modified) (3 diffs)
• libswish3/trunk/src/libswish3/header.c (modified) (4 diffs)
• libswish3/trunk/src/libswish3/libswish3.h (modified) (3 diffs)

libswish3/trunk/src/libswish3/config.c

@@ -181 +181 @@
-}
-
+swish_ConfigFlags *
+swish_init_config_flags(
+)
+{
+    swish_ConfigFlags   *flags;
+    int                  i;
+    
+    flags               = swish_xmalloc(sizeof(swish_ConfigFlags));
+    flags->tokenize     = 1;
+       
+    /* set all defaults to 0 */
+    for(i=0; i<SWISH_MAX_IDS; i++) {
+        flags->meta_ids[i] = 0;
+    }
+    for(i=0; i<SWISH_MAX_IDS; i++) {
+        flags->prop_ids[i] = 0;
+    }
+    
+    return flags;
+}
+
+    
+
-/* init config object */
-
-swish_Config *
-swish_init_config(
@@ -195 +217 @@
-/* the hashes will automatically grow as needed so we init with sane starting size */
-    config = swish_xmalloc(sizeof(swish_Config));
-xmalloc(sizeof(swish_ConfigFlags)
+init_config_flags(
-    config->misc = swish_init_hash(8);
-    config->metanames = swish_init_hash(8);
@@ -205 +227 @@
-    config->ref_cnt = 0;
-    config->stash = NULL;
-
-/* misc default flags */
-    config->flags->tokenize = 1;
-    
-    if (SWISH_DEBUG & SWISH_DEBUG_MEMORY) {

libswish3/trunk/src/libswish3/header.c

@@ -108 +108 @@
-    xmlChar *name
-);
+static void
+test_meta_unique_ids(
+    swish_MetaName *meta,
+    swish_Config *c,
+    xmlChar *name
+);
+static void
+test_prop_unique_ids(
+    swish_Property *prop,
+    swish_Config *c,
+    xmlChar *name
+);
-static headmaker *init_headmaker(
-);
@@ -744 +756 @@
-}
-
+static void
+test_meta_unique_ids(
+    swish_MetaName *meta,
+    swish_Config *c,
+    xmlChar *name
+)
+{
+    c->flags->meta_ids[ meta->id ]++;
+}
+
+static void
+test_prop_unique_ids(
+    swish_Property *prop,
+    swish_Config *c,
+    xmlChar *name
+)
+{
+    c->flags->prop_ids[ prop->id ]++;
+}
+
+void
+swish_config_test_unique_ids(
+    swish_Config *c
+)
+{
+    int i;
+    xmlHashScan(c->metanames,  (xmlHashScanner) test_meta_unique_ids, c);
+    xmlHashScan(c->properties, (xmlHashScanner) test_prop_unique_ids, c);
+    for(i=0; i<SWISH_MAX_IDS; i++) {
+        if (c->flags->meta_ids[i] > 1) {
+            SWISH_WARN("meta id %d == %d", i, c->flags->meta_ids[i]);
+        }
+        if (c->flags->prop_ids[i] > 1) {
+            SWISH_WARN("prop id %d == %d", i, c->flags->prop_ids[i]);
+        }
+        
+        /* set back to 0 in case we are called again */
+        c->flags->prop_ids[i] = 0;
+        c->flags->meta_ids[i] = 0;
+    } 
+}
+
-static headmaker *
-init_headmaker(
@@ -769 +823 @@
-    h = init_headmaker();
-    read_header(filename, h);
+    
+/*  test that all the alias_for links resolve ok */
+    swish_config_test_alias_fors(h->config);
+    
+/*  make sure ids are all unique */
+    swish_config_test_unique_ids(h->config);
+
-    swish_debug_config(h->config);
-    swish_free_config(h->config);
@@ -794 +855 @@
-    swish_xfree(h);
-
-now 
+
-    swish_config_test_alias_fors(c);
+    
+/*  make sure ids are all unique */
+    swish_config_test_unique_ids(c);
-
-    return 1;

libswish3/trunk/src/libswish3/libswish3.h

@@ -29 +29 @@
-#include <libxml/xmlstring.h>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+
+
+
+  
+  
+
+ 
+ 
-
-/* default config hash key names */
@@ -245 +245 @@
-{
-    boolean         tokenize;
+    boolean         meta_ids[SWISH_MAX_IDS];
+    boolean         prop_ids[SWISH_MAX_IDS];
-    
-};
@@ -488 +490 @@
-xmlChar *       swish_get_mime_type( swish_Config * config, xmlChar * fileext );
-xmlChar *       swish_get_parser( swish_Config * config, xmlChar *mime );
+void            swish_config_test_unique_ids( swish_Config *c );
+void            swish_config_test_alias_fors( swish_Config *c );
-/*
-=cut