From 8c45296eca5f2a470af319c85b83a9041dd2dd71 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Fri, 18 Jul 2003 16:25:03 +0000 Subject: [PATCH] Remove a few more warnings. --- src/basesuif/snoot/builtin.cc | 2 +- src/basesuif/snoot/c.h | 58 +++++++++++++++++++++---------------------- src/basesuif/snoot/error.cc | 6 ++--- src/basesuif/snoot/genop.cc | 24 +++++++++--------- src/basesuif/snoot/input.cc | 2 +- src/basesuif/snoot/output.cc | 10 ++++---- src/basesuif/snoot/stypes.cc | 20 +++++++-------- src/basesuif/snoot/sym.cc | 6 ++--- src/basesuif/suif1/symtab.h | 2 +- 9 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/basesuif/snoot/builtin.cc b/src/basesuif/snoot/builtin.cc index e63a361..3860669 100644 --- a/src/basesuif/snoot/builtin.cc +++ b/src/basesuif/snoot/builtin.cc @@ -18,7 +18,7 @@ struct builtin_info { - char *name; + const char *name; int type_arg_num; type_node *result_type; builtin_info *next; diff --git a/src/basesuif/snoot/c.h b/src/basesuif/snoot/c.h index 36d9530..78b6595 100644 --- a/src/basesuif/snoot/c.h +++ b/src/basesuif/snoot/c.h @@ -59,7 +59,7 @@ typedef union value /* constant values: */ typedef struct coord /* source coordinates: */ { - char *file; /* file name */ + const char *file; /* file name */ unsigned short x, y; /* x,y position in file */ } Coordinate; @@ -100,7 +100,7 @@ extern proc_sym *curr_proc; struct symbol /* symbol structures: */ { sym_node *suif_symbol; /* SUIF symbol */ - char *name; /* name */ + const char *name; /* name */ unsigned short scope; /* scope level */ unsigned char sclass; /* storage class */ unsigned defined:1; /* 1 if defined */ @@ -236,11 +236,11 @@ struct arena /* storage allocation arena: */ struct field /* struct/union fields: */ { - char *name; /* field name */ + const char *name; /* field name */ type_node *type; /* data type */ int offset; /* field offset */ short from, to; /* bit fields: bits from..to */ - char *block_name; /* for bit fields, the name of the SUIF field + const char *block_name; /* for bit fields, the name of the SUIF field containing this bit field; otherwise this is the same as ``name'' */ type_node *block_type; /* for bit fields, the type of the SUIF field @@ -379,20 +379,20 @@ extern boolean YYnull_used; /* The following are defined in "output.cc". */ -extern void fprint(FILE *fp, char *fmt, ...); +extern void fprint(FILE *fp, const char *fmt, ...); extern void print(char *fmt, ...); extern void gprint(void (*s_printer)(const char *to_print, void *data), void (*c_printer)(int to_print, void *data), void *data, char *fmt, ...); -extern char *stringf(char *fmt, ...); +extern char *stringf(const char *fmt, ...); extern void outflush(void); -extern void vfprint(FILE *fp, char *fmt, va_list ap); +extern void vfprint(FILE *fp, const char *fmt, va_list ap); /* The following are defined in "error.cc". */ -extern void error(char *fmt, ...); -extern int fatal(char *name, char *fmt, int n); -extern void warning(char *fmt, ...); +extern void error(const char *fmt, ...); +extern int fatal(const char *name, const char *fmt, int n); +extern void warning(const char *fmt, ...); extern int expect(int tok); extern void skipto(int tok, char set[]); extern void test(int tok, char set[]); @@ -453,9 +453,9 @@ extern void foreach(Table tp, int lev, void (*apply)(Symbol, Generic), Generic cl); extern label_sym *genlabel(void); extern label_sym *gen_user_label(char *name); -extern char *gen_internal_name(void); -extern Symbol install(char *name, Table *tpp, int perm); -extern Symbol lookup(char *name, Table tp); +extern const char *gen_internal_name(void); +extern Symbol install(const char *name, Table *tpp, int perm); +extern Symbol lookup(const char *name, Table tp); extern void setuses(Table tp); extern Table table(Table tp, int lev); extern void use(Symbol id_info, Coordinate src); @@ -483,16 +483,16 @@ extern Field fieldref(char *name, type_node *ty); extern type_node *freturn(type_node *ty); extern func_type *func(type_node *ty); extern boolean hasproto(type_node *ty); -extern Field newfield(char *name, struct field **field_list, type_node *fty, - struct_type *to_fill); -extern Symbol newstruct(int op, char *tag); +extern Field newfield(const char *name, struct field **field_list, + type_node *fty, struct_type *to_fill); +extern Symbol newstruct(int op, const char *tag); extern void outtype(void (*s_printer)(const char *to_print, void *data), void (*c_printer)(int to_print, void *data), void *data, type_node *ty); extern void printdecl(Symbol p, type_node *ty); extern void printproto(Symbol p, Symbol callee[]); extern type_node *qual(int op, type_node *ty); -extern char *typestring(type_node *ty, char *str); +extern const char *typestring(type_node *ty, const char *str); extern type_node *base_from_enum(type_node *the_type); extern type_node *base_from_pointer(type_node *the_type); extern type_node *base_from_array(type_node *the_type); @@ -562,18 +562,18 @@ extern immed immed_and_type_for_C_intconst(char *C_intconst, extern immed immed_and_type_for_C_floatconst(char *C_floatconst, type_node **the_type); -extern char *k_sequence_point; -extern char *k_bit_field_info; -extern char *k_type_name; -extern char *k_type_source_coordinates; -extern char *k_field_table; -extern char *k_type_alignment; -extern char *k_C_comment; -extern char *k_source_coordinates; -extern char *k_is_declared_reg; -extern char *k_source_references; -extern char *k_builtin_args; -extern char *k_typedef_name; +extern const char *k_sequence_point; +extern const char *k_bit_field_info; +extern const char *k_type_name; +extern const char *k_type_source_coordinates; +extern const char *k_field_table; +extern const char *k_type_alignment; +extern const char *k_C_comment; +extern const char *k_source_coordinates; +extern const char *k_is_declared_reg; +extern const char *k_source_references; +extern const char *k_builtin_args; +extern const char *k_typedef_name; extern boolean option_keep_comments; extern boolean option_mark_execution_points; diff --git a/src/basesuif/snoot/error.cc b/src/basesuif/snoot/error.cc index cc26a3b..668be16 100644 --- a/src/basesuif/snoot/error.cc +++ b/src/basesuif/snoot/error.cc @@ -20,7 +20,7 @@ boolean wflag; /* TRUE to suppress warning messages */ static void printtoken(void); /* error - issue error message */ -void error(char *fmt, ...) +void error(const char *fmt, ...) { va_list ap; @@ -55,7 +55,7 @@ int expect(int tok) } /* fatal - issue fatal error message and exit */ -int fatal(char *name, char *fmt, int n) +int fatal(const char *name, const char *fmt, int n) { fputc('\n', stdout); outflush(); @@ -160,7 +160,7 @@ void test(int tok, char set[]) } /* warning - issue warning error message */ -void warning(char *fmt, ...) +void warning(const char *fmt, ...) { va_list ap; diff --git a/src/basesuif/snoot/genop.cc b/src/basesuif/snoot/genop.cc index 0afc8bf..40c058e 100644 --- a/src/basesuif/snoot/genop.cc +++ b/src/basesuif/snoot/genop.cc @@ -23,18 +23,18 @@ typedef struct sym_node_list *read_multiple; } read_once_data; -char *k_sequence_point; -char *k_bit_field_info; -char *k_type_name; -char *k_type_source_coordinates; -char *k_field_table; -char *k_type_alignment; -char *k_C_comment; -char *k_source_coordinates; -char *k_is_declared_reg; -char *k_source_references; -char *k_builtin_args; -char *k_typedef_name; +const char *k_sequence_point; +const char *k_bit_field_info; +const char *k_type_name; +const char *k_type_source_coordinates; +const char *k_field_table; +const char *k_type_alignment; +const char *k_C_comment; +const char *k_source_coordinates; +const char *k_is_declared_reg; +const char *k_source_references; +const char *k_builtin_args; +const char *k_typedef_name; boolean option_keep_comments = FALSE; boolean option_mark_execution_points = FALSE; diff --git a/src/basesuif/snoot/input.cc b/src/basesuif/snoot/input.cc index 63a8332..bece419 100644 --- a/src/basesuif/snoot/input.cc +++ b/src/basesuif/snoot/input.cc @@ -109,7 +109,7 @@ static void pragma(void) t = gettok(); - char *annote_name; + const char *annote_name; if ((t == ID) && (strcmp(token, "suif_annote") == 0)) { while ((*cp == ' ') || (*cp == '\t')) diff --git a/src/basesuif/snoot/output.cc b/src/basesuif/snoot/output.cc index b49f3fe..b88c014 100644 --- a/src/basesuif/snoot/output.cc +++ b/src/basesuif/snoot/output.cc @@ -23,10 +23,10 @@ static void string_buffer_print(const char *to_print, void *); static void char_buffer_print(int to_print, void *); static void vgprint(void (*s_printer)(const char *to_print, void *data), void (*c_printer)(int to_print, void *data), void *data, - char *fmt, va_list ap); + const char *fmt, va_list ap); /* fprint - formatted output to file pointer fp */ -void fprint(FILE *fp, char *fmt, ...) +void fprint(FILE *fp, const char *fmt, ...) { va_list ap; @@ -65,7 +65,7 @@ extern void gprint(void (*s_printer)(const char *to_print, void *data), } /* stringf - formatted output to a saved string */ -char *stringf(char *fmt, ...) +char *stringf(const char *fmt, ...) { va_list ap; @@ -85,7 +85,7 @@ char *stringf(char *fmt, ...) } /* vfprint - formatted output to file pointer fp */ -void vfprint(FILE *fp, char *fmt, va_list ap) +void vfprint(FILE *fp, const char *fmt, va_list ap) { vgprint(&string_file_print, &char_file_print, fp, fmt, ap); } @@ -143,7 +143,7 @@ static void char_buffer_print(int to_print, void *) static void vgprint(void (*s_printer)(const char *to_print, void *data), void (*c_printer)(int to_print, void *data), void *data, - char *fmt, va_list ap) + const char *fmt, va_list ap) { char buf[40], *s; diff --git a/src/basesuif/snoot/stypes.cc b/src/basesuif/snoot/stypes.cc index b1229a7..6ad1ce4 100644 --- a/src/basesuif/snoot/stypes.cc +++ b/src/basesuif/snoot/stypes.cc @@ -697,8 +697,8 @@ extern boolean hasproto(type_node *ty) } /* newfield - install a new field in ty with type fty */ -extern Field newfield(char *name, struct field **field_list, type_node *fty, - struct_type *to_fill) +extern Field newfield(const char *name, struct field **field_list, + type_node *fty, struct_type *to_fill) { Field p, *q = field_list; @@ -743,7 +743,7 @@ extern Field newfield(char *name, struct field **field_list, type_node *fty, /* newstruct - install a new structure/union/enum depending on op and return its symbol table entry */ -Symbol newstruct(int op, char *tag) +Symbol newstruct(int op, const char *tag) { assert((op == ENUM) || (op == STRUCT) || (op == UNION)); if ((tag == NULL) || (*tag == '\0')) /* anonymous structure/union/enum */ @@ -835,7 +835,7 @@ extern void outtype(void (*s_printer)(const char *to_print, void *data), case TYPE_UNION: case TYPE_ENUM: { - char *ty_name; + const char *ty_name; int op; if (ty->op() == TYPE_ENUM) { @@ -1044,10 +1044,10 @@ extern type_node *qual(int op, type_node *ty) } /* typestring - return ty as C declaration for str, which may be "" */ -extern char *typestring(type_node *ty, char *str) +extern const char *typestring(type_node *ty, const char *str) { assert(ty != NULL); - char *name = NULL; + const char *name = NULL; if (ty == chartype) name = chartype_sym->name; else if (ty == doubletype) @@ -1109,7 +1109,7 @@ extern char *typestring(type_node *ty, char *str) stringf("%s %s", p->name, str) : p->name); } - char *name; + const char *name; int op; if (ty->op() == TYPE_ENUM) { @@ -1431,7 +1431,7 @@ extern boolean compatible_types(type_node *type1, type_node *type2) for (unsigned field_num = 0; field_num < num_fields; ++field_num) { - char *name1 = struct1->field_name(field_num); + const char *name1 = struct1->field_name(field_num); type_node *field1 = struct1->field_type(field_num); unsigned field_2_num; @@ -1502,7 +1502,7 @@ extern boolean compatible_types(type_node *type1, type_node *type2) for (unsigned value_num = 0; value_num < num_values; ++value_num) { - char *value_name = enum1->member(value_num); + const char *value_name = enum1->member(value_num); int value_value = enum1->value(value_num); int value_2_num = enum2->find_member_by_value(value_value); if (value_2_num == -1) @@ -1652,7 +1652,7 @@ extern struct field *bit_field_list(struct_type *the_struct, immed type_value = the_iter.step(); assert(type_value.is_string()); - char *type_string = type_value.string(); + const char *type_string = type_value.string(); boolean is_volatile = FALSE; boolean is_constant = FALSE; diff --git a/src/basesuif/snoot/sym.cc b/src/basesuif/snoot/sym.cc index bde137b..dedc7ed 100644 --- a/src/basesuif/snoot/sym.cc +++ b/src/basesuif/snoot/sym.cc @@ -211,7 +211,7 @@ label_sym *gen_user_label(char *name) return result; } -char *gen_internal_name(void) +const char *gen_internal_name(void) { char num_buffer[20]; static int name_counter = 1; @@ -223,7 +223,7 @@ char *gen_internal_name(void) /* install - install name in table *tp; permanently allocate entry iff perm != 0 */ -Symbol install(char *name, Table *tpp, int perm) +Symbol install(const char *name, Table *tpp, int perm) { struct entry *p; unsigned h = (unsigned)name & (HASHSIZE - 1); @@ -257,7 +257,7 @@ Symbol install(char *name, Table *tpp, int perm) } /* lookup - lookup name in table tp, return pointer to entry */ -Symbol lookup(char *name, Table tp) +Symbol lookup(const char *name, Table tp) { struct entry *p; unsigned h = (unsigned)name & (HASHSIZE - 1); diff --git a/src/basesuif/suif1/symtab.h b/src/basesuif/suif1/symtab.h index ee79757..9e8aac1 100644 --- a/src/basesuif/suif1/symtab.h +++ b/src/basesuif/suif1/symtab.h @@ -202,7 +202,7 @@ public: symtab_kinds kind() { return SYMTAB_GLOBAL; } proc_sym *new_proc(func_type *r, src_lang_type src, const char *n); - proc_sym *lookup_proc(char *s, boolean up=TRUE) + proc_sym *lookup_proc(const char *s, boolean up=TRUE) { return (proc_sym *)lookup_sym(s, SYM_PROC, up); } void predefine_types(); /* create common types */ -- 2.11.4.GIT