fixes

[henge/apc.git] / src / ir.c

diff --git a/src/ir.c b/src/ir.c
index b68142e..f39f85b 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -215,9 +215,14 @@ struct ir_class_t* ir_class_addchild
   const uint8_t*     name\r
 )\r
 { struct ir_class_t* iter;\r
+  printf("Class %s, addchild %s\n", class->name, name);\r
   if (class->nextchild == NULL)\r
-    return class->nextchild = struct_alloc(ir_class_t);\r
+    goto alloc;\r
   iter = class->nextchild;\r
+  if (iter->name == NULL)\r
+    eprintf("Null name pointer in class %p\n", iter);\r
+  if (name == NULL)\r
+    eprintf("Null child added to class %s\n", iter->name);\r
  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r
@@ -225,6 +230,7 @@ struct ir_class_t* ir_class_addchild
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
+ alloc:\r
   iter = struct_alloc(ir_class_t);\r
   iter->nextsib = class->nextchild;\r
   iter->name = name_alloc(name);\r
@@ -240,9 +246,14 @@ struct ir_set_t* ir_class_addset
   const uint8_t*     name\r
 )\r
 { struct ir_set_t* iter;\r
+  printf("Class %s, addset %s\n", class->name, name);\r
   if (class->root_set == NULL)\r
-    return class->root_set = struct_alloc(ir_set_t);\r
+    goto alloc;\r
   iter = class->root_set;\r
+  if (iter->name == NULL)\r
+    eprintf("Null name pointer in class %p\n", iter);\r
+  if (name == NULL)\r
+    eprintf("Null set added to class %s\n", iter->name);\r
  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r
@@ -250,6 +261,7 @@ struct ir_set_t* ir_class_addset
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
+ alloc:\r
   iter = struct_alloc(ir_set_t);\r
   iter->nextsib = class->root_set;\r
   iter->name = name_alloc(name);\r
@@ -265,9 +277,14 @@ struct ir_set_t* ir_set_addchild
   const uint8_t*   name\r
 )\r
 { struct ir_set_t* iter;\r
+  printf("Set %s, addchild %s\n", set->name, name);\r
   if (set->nextchild == NULL)\r
-    return set->nextchild = struct_alloc(ir_set_t);\r
+    goto alloc;\r
   iter = set->nextchild;\r
+  if (iter->name == NULL)\r
+    eprintf("Null name pointer in set %p\n", iter);\r
+  if (name == NULL)\r
+    eprintf("Null child added to set %s\n", iter->name);\r
  check:\r
   if (bytes_identical(iter->name, name))\r
     return iter;\r
@@ -275,6 +292,7 @@ struct ir_set_t* ir_set_addchild
     { iter = iter->nextsib;\r
       goto check;\r
     }\r
+ alloc:\r
   iter = struct_alloc(ir_set_t);\r
   iter->nextsib = set->nextchild;\r
   iter->name = name_alloc(name);\r
@@ -292,7 +310,7 @@ struct ir_framebox_t* ir_set_add_framebox
 )\r
 { struct ir_framebox_t* iter;\r
   if (set->frameboxes == NULL)\r
-    return set->frameboxes = struct_alloc(ir_framebox_t);\r
+    goto alloc;\r
   iter = set->frameboxes;\r
  check:\r
   if (bytes_identical(iter->header.data_name, name))\r
@@ -301,6 +319,7 @@ struct ir_framebox_t* ir_set_add_framebox
     { iter = (struct ir_framebox_t*) iter->header.nextsib;\r
       goto check;\r
     }\r
+ alloc:\r
   iter = struct_alloc(ir_framebox_t);\r
   iter->header.nextsib = (union ir_setdata_t*) set->frameboxes;\r
   iter->header.data_name = name_alloc(name);\r
@@ -390,7 +409,9 @@ void ir_data_assign_path
 ( union ir_setdata_t* setdata,\r
   const uint8_t*      path\r
 )\r
-{ if (setdata->header.src_filename != NULL)\r
+{ if (path == NULL)\r
+    eprintf("Null path in data %s\n", setdata->header.data_name);\r
+  if (setdata->header.src_filename != NULL)\r
     wprintf("Path override: %s -> %s for setdata %s\n",\r
            setdata->header.src_filename, path, setdata->header.data_name);\r
   setdata->header.src_filename = name_alloc(path);\r
@@ -421,6 +442,8 @@ union ir_setdata_t* ir_framedata
   int            height\r
 )\r
 { struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
+  if (name == NULL)\r
+    eprint("Null name in set allocation\n");\r
   framedata->header.type = type;\r
   framedata->header.data_name = name_alloc(name);\r
   framedata->frameinfo.facing = d;\r
@@ -432,6 +455,8 @@ union ir_setdata_t* ir_framedata
 union ir_setdata_t* ir_audio\r
 ( const uint8_t* name )\r
 { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
+  if (name == NULL)\r
+    eprint("Null audio\n");\r
   audio->header.type = ADAT;\r
   audio->header.data_name = name_alloc(name);\r
   return (union ir_setdata_t*) audio;\r
@@ -442,6 +467,8 @@ union ir_setdata_t* ir_audio
 struct ir_classld_t* ir_classld_from_class\r
 ( struct ir_class_t* class )\r
 { struct ir_classld_t* classld;\r
+  if (class == NULL)\r
+    eprint("Null class in classld\n");\r
   classld = struct_alloc(ir_classld_t);\r
   classld->root_class = class;\r
   return classld;\r