const revision

diff --git a/src/ir.c b/src/ir.c
index 4b01142..b68142e 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -101,17 +101,17 @@ struct ir_set_t
 static inline\r
 int                   init_pagelist(struct pagelist_t*,size_t);\r
 static inline\r
-struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);\r
+struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,const uint8_t*);\r
 static\r
 void                  ir_free_pagenodes(struct pagenode_t*);\r
 static inline\r
-int                   bytes_identical(uint8_t*,uint8_t*);\r
+int                   bytes_identical(const uint8_t*,const uint8_t*);\r
 static\r
 void*                 stack_alloc(size_t);\r
 static\r
-uint8_t*              name_alloc(uint8_t*);\r
+uint8_t*              name_alloc(const uint8_t*);\r
 static inline\r
-union ir_setdata_t*   ir_framedata (enum dtype,uint8_t*,apc_facing,int,int);\r
+union ir_setdata_t*   ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);\r
 /* Function-Like Macros */\r
 #define do_warn() do {                         \\r
   } while (0)\r
@@ -212,7 +212,7 @@ struct ir_class_t* ir_class_root
 */\r
 struct ir_class_t* ir_class_addchild\r
 ( struct ir_class_t* class,\r
-  uint8_t*           name\r
+  const uint8_t*     name\r
 )\r
 { struct ir_class_t* iter;\r
   if (class->nextchild == NULL)\r
@@ -237,7 +237,7 @@ struct ir_class_t* ir_class_addchild
 */\r
 struct ir_set_t* ir_class_addset\r
 ( struct ir_class_t* class,\r
-  uint8_t*           name\r
+  const uint8_t*     name\r
 )\r
 { struct ir_set_t* iter;\r
   if (class->root_set == NULL)\r
@@ -262,7 +262,7 @@ struct ir_set_t* ir_class_addset
 */\r
 struct ir_set_t* ir_set_addchild\r
 ( struct ir_set_t* set,\r
-  uint8_t*         name\r
+  const uint8_t*   name\r
 )\r
 { struct ir_set_t* iter;\r
   if (set->nextchild == NULL)\r
@@ -288,7 +288,7 @@ struct ir_set_t* ir_set_addchild
 static inline\r
 struct ir_framebox_t* ir_set_add_framebox\r
 ( struct ir_set_t* set,\r
-  uint8_t*         name\r
+  const uint8_t*   name\r
 )\r
 { struct ir_framebox_t* iter;\r
   if (set->frameboxes == NULL)\r
@@ -312,14 +312,14 @@ struct ir_framebox_t* ir_set_add_framebox
 */\r
 static inline\r
 int bytes_identical\r
-( uint8_t* stra,\r
-  uint8_t* strb\r
+( const uint8_t* stra,\r
+  const uint8_t* strb\r
 )\r
 { int ca, cb;\r
   do {\r
     ca = *stra++;\r
     cb = *strb++;\r
-  } while (ca && ca == cb);\r
+  } while (ca && ca != '_' && ca == cb);\r
   return (ca == cb);\r
 }\r
 \r
@@ -388,7 +388,7 @@ void ir_set_assign_ref
 \r
 void ir_data_assign_path\r
 ( union ir_setdata_t* setdata,\r
-  uint8_t*            path\r
+  const uint8_t*      path\r
 )\r
 { if (setdata->header.src_filename != NULL)\r
     wprintf("Path override: %s -> %s for setdata %s\n",\r
@@ -397,28 +397,28 @@ void ir_data_assign_path
 }\r
 \r
 union ir_setdata_t* ir_framesheet\r
-( uint8_t*   name,\r
-  apc_facing d,\r
-  int        width,\r
-  int        height\r
+( const uint8_t* name,\r
+  apc_facing     d,\r
+  int            width,\r
+  int            height\r
 )\r
 { return ir_framedata(FSDAT, name, d, width, height); }\r
 \r
 union ir_setdata_t* ir_mapsheet\r
-( uint8_t*   name,\r
-  apc_facing d,\r
-  int        width,\r
-  int        height\r
+( const uint8_t* name,\r
+  apc_facing     d,\r
+  int            width,\r
+  int            height\r
 )\r
 { return ir_framedata(MSDAT, name, d, width, height); }\r
 \r
 static inline\r
 union ir_setdata_t* ir_framedata\r
-( enum dtype type,\r
-  uint8_t*   name,\r
-  apc_facing d,\r
-  int        width,\r
-  int        height\r
+( enum dtype     type,\r
+  const uint8_t* name,\r
+  apc_facing     d,\r
+  int            width,\r
+  int            height\r
 )\r
 { struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
   framedata->header.type = type;\r
@@ -430,7 +430,7 @@ union ir_setdata_t* ir_framedata
 }\r
 \r
 union ir_setdata_t* ir_audio\r
-( uint8_t* name )\r
+( const uint8_t* name )\r
 { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);\r
   audio->header.type = ADAT;\r
   audio->header.data_name = name_alloc(name);\r
@@ -457,7 +457,7 @@ struct ir_setld_t* ir_setld_from_ref
 \r
 struct ir_setld_t* ir_setld_from_classld\r
 ( struct ir_classld_t* classld,\r
-  uint8_t*             name\r
+  const uint8_t*       name\r
 )\r
 { struct ir_setld_t* setld;\r
   setld = struct_alloc(ir_setld_t);\r
@@ -470,7 +470,7 @@ struct ir_setld_t* ir_setld_from_classld
 \r
 struct ir_setld_t* ir_setld_addchild\r
 ( struct ir_setld_t* setld,\r
-  uint8_t*           name\r
+  const uint8_t*     name\r
 )\r
 { if (setld->namelist == NULL)\r
     { setld->namelist = struct_alloc(ir_namelist_t);\r
@@ -487,7 +487,7 @@ struct ir_setld_t* ir_setld_addchild
 union ir_setdata_t* ir_link\r
 ( enum ltype         link_type,\r
   struct ir_setld_t* setld,\r
-  uint8_t*           name\r
+  const uint8_t*     name\r
 )\r
 { struct ir_link_t* link;\r
   link = struct_alloc(ir_link_t);\r
@@ -519,13 +519,14 @@ void* stack_alloc
 \r
 static\r
 uint8_t* name_alloc\r
-( uint8_t* name_src )\r
-{ uint8_t* iter, * name;\r
-  int      head_mem;\r
+( const uint8_t* name_src )\r
+{ const uint8_t* iter;\r
+  uint8_t*       name;\r
+  int            head_mem;\r
  copy:\r
   name = (uint8_t*)namepages.head->header.head;\r
   iter = name_src;\r
-  for (head_mem = PL_HEADMEM(namepages); *iter && head_mem; head_mem--)\r
+  for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && head_mem; head_mem--)\r
     *(namepages.head->header.head)++ = *iter++;\r
   if (head_mem == 0) //not enough room\r
     { namepages.head->header.next = (struct pagenode_t*) calloc(namepages.pagesize,1);\r

diff --git a/src/ir.h b/src/ir.h
index 6d045dd..339a4e7 100644 (file)
--- a/src/ir.h
+++ b/src/ir.h
@@ -46,9 +46,9 @@ typedef struct ir_classld_t* ir_classld;
    specified set.\r
 */\r
 ir_class   ir_class_root(void);\r
-ir_class   ir_class_addchild(ir_class, uint8_t*);\r
-ir_set     ir_class_addset(ir_class,uint8_t*);\r
-ir_set     ir_set_addchild(ir_set,uint8_t*);\r
+ir_class   ir_class_addchild(ir_class,const uint8_t*);\r
+ir_set     ir_class_addset(ir_class,const uint8_t*);\r
+ir_set     ir_set_addchild(ir_set,const uint8_t*);\r
 /* Set Data\r
    Each set can contain up to FACING_MAX each of framesheets and mapsheets, one\r
    sheet for each facing, per label.  Each set can contain any number of audio\r
@@ -66,11 +66,11 @@ ir_set     ir_set_addchild(ir_set,uint8_t*);
 enum ltype { OLINK, MLINK, VLINK, ALINK };\r
 void       ir_set_assign_data(ir_set,ir_setdata);\r
 void       ir_set_assign_ref(ir_set,long long);\r
-void       ir_data_assign_path(ir_setdata,uint8_t*);\r
-ir_setdata ir_framesheet(uint8_t*, apc_facing, int,int);\r
-ir_setdata ir_mapsheet(uint8_t*, apc_facing, int,int);\r
-ir_setdata ir_audio(uint8_t*);\r
-ir_setdata ir_link(enum ltype, ir_setld, uint8_t*);\r
+void       ir_data_assign_path(ir_setdata,const uint8_t*);\r
+ir_setdata ir_framesheet(const uint8_t*, apc_facing, int,int);\r
+ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int);\r
+ir_setdata ir_audio(const uint8_t*);\r
+ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*);\r
 /* Reference Linking Data \r
    Create linking data to sets or classes that will be resolved at a later\r
    stage.  Class references can be created from an ir_class object, if\r
@@ -81,8 +81,8 @@ ir_setdata ir_link(enum ltype, ir_setld, uint8_t*);
 */\r
 ir_classld ir_classld_from_class(ir_class);\r
 ir_classld ir_classld_from_root(void);\r
-ir_classld ir_classld_addchild(ir_classld,uint8_t*);\r
+ir_classld ir_classld_addchild(ir_classld,const uint8_t*);\r
 ir_setld   ir_setld_from_ref(long long);\r
-ir_setld   ir_setld_from_classld(ir_classld,uint8_t*);\r
-ir_setld   ir_setld_addchild(ir_setld,uint8_t*);\r
+ir_setld   ir_setld_from_classld(ir_classld,const uint8_t*);\r
+ir_setld   ir_setld_addchild(ir_setld,const uint8_t*);\r
 #endif //_IR_H_\r