X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=sim%2Fucsim%2Futils.cc;h=eb648e7ff56e8cf0447cf425f2c25778b32d2d66;hb=34d14506fd0c12ee5434fec0f9dec27753e1aab5;hp=a46aebc460ad40a7c362e27e840f64fcc5370fb2;hpb=9c1f16e0c496f60a6e49aa115b8819f4f3b2e585;p=fw%2Fsdcc diff --git a/sim/ucsim/utils.cc b/sim/ucsim/utils.cc index a46aebc4..eb648e7f 100644 --- a/sim/ucsim/utils.cc +++ b/sim/ucsim/utils.cc @@ -67,7 +67,7 @@ get_sub_opt(char **option, const char * const *tokens, char **valuep) } -char * +const char * get_id_string(struct id_element *ids, int id) { int i= 0; @@ -77,16 +77,16 @@ get_id_string(struct id_element *ids, int id) return(ids[i].id_string); } -char * -get_id_string(struct id_element *ids, int id, char *def) +const char * +get_id_string(struct id_element *ids, int id, const char *def) { - char *s= get_id_string(ids, id); + const char *s= get_id_string(ids, id); return(s?s:def); } int -get_string_id(struct id_element *ids, char *str) +get_string_id(struct id_element *ids, const char *str) { int i= 0; @@ -96,7 +96,7 @@ get_string_id(struct id_element *ids, char *str) } int -get_string_id(struct id_element *ids, char *str, int def) +get_string_id(struct id_element *ids, const char *str, int def) { int i= 0; @@ -110,7 +110,7 @@ extern "C" int vasprintf(char **strp, const char *format, va_list ap); extern "C" int vsnprintf(char *str, size_t size,const char *format,va_list ap); char * -format_string(char *format, ...) +format_string(const char *format, ...) { va_list ap; @@ -135,10 +135,10 @@ format_string(char *format, ...) } -char * +const char * object_name(class cl_base *o) { - char *name= 0; + const char *name= 0; if (o) name= o->get_name(); @@ -149,7 +149,7 @@ object_name(class cl_base *o) char * -case_string(enum letter_case lcase, char *str) +case_string(enum letter_case lcase, const char *str) { char *p= strdup(str); char *s= p; @@ -182,7 +182,7 @@ case_string(enum letter_case lcase, char *str) return(s); } -/*char * +/*const char * case_string(enum letter_case lcase, const char *str) { char *p= NIL;