From 626bf46e0e2c2658242460fc63526dd4f14de0f6 Mon Sep 17 00:00:00 2001 From: ken Date: Sat, 14 Jan 2017 09:56:18 -0800 Subject: [PATCH] const revision --- src/ir.c | 67 ++++++++++++++++++++++++++++---------------------------- src/ir.h | 22 +++++++++---------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/ir.c b/src/ir.c index 4b01142..b68142e 100644 --- a/src/ir.c +++ b/src/ir.c @@ -101,17 +101,17 @@ struct ir_set_t static inline int init_pagelist(struct pagelist_t*,size_t); static inline -struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*); +struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,const uint8_t*); static void ir_free_pagenodes(struct pagenode_t*); static inline -int bytes_identical(uint8_t*,uint8_t*); +int bytes_identical(const uint8_t*,const uint8_t*); static void* stack_alloc(size_t); static -uint8_t* name_alloc(uint8_t*); +uint8_t* name_alloc(const uint8_t*); static inline -union ir_setdata_t* ir_framedata (enum dtype,uint8_t*,apc_facing,int,int); +union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int); /* Function-Like Macros */ #define do_warn() do { \ } while (0) @@ -212,7 +212,7 @@ struct ir_class_t* ir_class_root */ struct ir_class_t* ir_class_addchild ( struct ir_class_t* class, - uint8_t* name + const uint8_t* name ) { struct ir_class_t* iter; if (class->nextchild == NULL) @@ -237,7 +237,7 @@ struct ir_class_t* ir_class_addchild */ struct ir_set_t* ir_class_addset ( struct ir_class_t* class, - uint8_t* name + const uint8_t* name ) { struct ir_set_t* iter; if (class->root_set == NULL) @@ -262,7 +262,7 @@ struct ir_set_t* ir_class_addset */ struct ir_set_t* ir_set_addchild ( struct ir_set_t* set, - uint8_t* name + const uint8_t* name ) { struct ir_set_t* iter; if (set->nextchild == NULL) @@ -288,7 +288,7 @@ struct ir_set_t* ir_set_addchild static inline struct ir_framebox_t* ir_set_add_framebox ( struct ir_set_t* set, - uint8_t* name + const uint8_t* name ) { struct ir_framebox_t* iter; if (set->frameboxes == NULL) @@ -312,14 +312,14 @@ struct ir_framebox_t* ir_set_add_framebox */ static inline int bytes_identical -( uint8_t* stra, - uint8_t* strb +( const uint8_t* stra, + const uint8_t* strb ) { int ca, cb; do { ca = *stra++; cb = *strb++; - } while (ca && ca == cb); + } while (ca && ca != '_' && ca == cb); return (ca == cb); } @@ -388,7 +388,7 @@ void ir_set_assign_ref void ir_data_assign_path ( union ir_setdata_t* setdata, - uint8_t* path + const uint8_t* path ) { if (setdata->header.src_filename != NULL) wprintf("Path override: %s -> %s for setdata %s\n", @@ -397,28 +397,28 @@ void ir_data_assign_path } union ir_setdata_t* ir_framesheet -( uint8_t* name, - apc_facing d, - int width, - int height +( const uint8_t* name, + apc_facing d, + int width, + int height ) { return ir_framedata(FSDAT, name, d, width, height); } union ir_setdata_t* ir_mapsheet -( uint8_t* name, - apc_facing d, - int width, - int height +( const uint8_t* name, + apc_facing d, + int width, + int height ) { return ir_framedata(MSDAT, name, d, width, height); } static inline union ir_setdata_t* ir_framedata -( enum dtype type, - uint8_t* name, - apc_facing d, - int width, - int height +( enum dtype type, + const uint8_t* name, + apc_facing d, + int width, + int height ) { struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t); framedata->header.type = type; @@ -430,7 +430,7 @@ union ir_setdata_t* ir_framedata } union ir_setdata_t* ir_audio -( uint8_t* name ) +( const uint8_t* name ) { struct ir_simplex_t* audio = struct_alloc(ir_simplex_t); audio->header.type = ADAT; audio->header.data_name = name_alloc(name); @@ -457,7 +457,7 @@ struct ir_setld_t* ir_setld_from_ref struct ir_setld_t* ir_setld_from_classld ( struct ir_classld_t* classld, - uint8_t* name + const uint8_t* name ) { struct ir_setld_t* setld; setld = struct_alloc(ir_setld_t); @@ -470,7 +470,7 @@ struct ir_setld_t* ir_setld_from_classld struct ir_setld_t* ir_setld_addchild ( struct ir_setld_t* setld, - uint8_t* name + const uint8_t* name ) { if (setld->namelist == NULL) { setld->namelist = struct_alloc(ir_namelist_t); @@ -487,7 +487,7 @@ struct ir_setld_t* ir_setld_addchild union ir_setdata_t* ir_link ( enum ltype link_type, struct ir_setld_t* setld, - uint8_t* name + const uint8_t* name ) { struct ir_link_t* link; link = struct_alloc(ir_link_t); @@ -519,13 +519,14 @@ void* stack_alloc static uint8_t* name_alloc -( uint8_t* name_src ) -{ uint8_t* iter, * name; - int head_mem; +( const uint8_t* name_src ) +{ const uint8_t* iter; + uint8_t* name; + int head_mem; copy: name = (uint8_t*)namepages.head->header.head; iter = name_src; - for (head_mem = PL_HEADMEM(namepages); *iter && head_mem; head_mem--) + for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && head_mem; head_mem--) *(namepages.head->header.head)++ = *iter++; if (head_mem == 0) //not enough room { namepages.head->header.next = (struct pagenode_t*) calloc(namepages.pagesize,1); diff --git a/src/ir.h b/src/ir.h index 6d045dd..339a4e7 100644 --- a/src/ir.h +++ b/src/ir.h @@ -46,9 +46,9 @@ typedef struct ir_classld_t* ir_classld; specified set. */ ir_class ir_class_root(void); -ir_class ir_class_addchild(ir_class, uint8_t*); -ir_set ir_class_addset(ir_class,uint8_t*); -ir_set ir_set_addchild(ir_set,uint8_t*); +ir_class ir_class_addchild(ir_class,const uint8_t*); +ir_set ir_class_addset(ir_class,const uint8_t*); +ir_set ir_set_addchild(ir_set,const uint8_t*); /* Set Data Each set can contain up to FACING_MAX each of framesheets and mapsheets, one sheet for each facing, per label. Each set can contain any number of audio @@ -66,11 +66,11 @@ ir_set ir_set_addchild(ir_set,uint8_t*); enum ltype { OLINK, MLINK, VLINK, ALINK }; void ir_set_assign_data(ir_set,ir_setdata); void ir_set_assign_ref(ir_set,long long); -void ir_data_assign_path(ir_setdata,uint8_t*); -ir_setdata ir_framesheet(uint8_t*, apc_facing, int,int); -ir_setdata ir_mapsheet(uint8_t*, apc_facing, int,int); -ir_setdata ir_audio(uint8_t*); -ir_setdata ir_link(enum ltype, ir_setld, uint8_t*); +void ir_data_assign_path(ir_setdata,const uint8_t*); +ir_setdata ir_framesheet(const uint8_t*, apc_facing, int,int); +ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int); +ir_setdata ir_audio(const uint8_t*); +ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*); /* Reference Linking Data Create linking data to sets or classes that will be resolved at a later stage. Class references can be created from an ir_class object, if @@ -81,8 +81,8 @@ ir_setdata ir_link(enum ltype, ir_setld, uint8_t*); */ ir_classld ir_classld_from_class(ir_class); ir_classld ir_classld_from_root(void); -ir_classld ir_classld_addchild(ir_classld,uint8_t*); +ir_classld ir_classld_addchild(ir_classld,const uint8_t*); ir_setld ir_setld_from_ref(long long); -ir_setld ir_setld_from_classld(ir_classld,uint8_t*); -ir_setld ir_setld_addchild(ir_setld,uint8_t*); +ir_setld ir_setld_from_classld(ir_classld,const uint8_t*); +ir_setld ir_setld_addchild(ir_setld,const uint8_t*); #endif //_IR_H_ -- 2.18.0