diff --git a/dwarves.h b/dwarves.h index cf49f49..be38b52 100644 --- a/dwarves.h +++ b/dwarves.h @@ -1298,7 +1298,7 @@ static inline const char *enumerator__name(const struct enumerator *enumerator) void enumeration__delete(struct type *type, struct cu *cu); void enumeration__add(struct type *type, struct enumerator *enumerator); -size_t enumeration__fprintf(const struct tag *tag_enum, const struct cu *cu, +size_t enumeration__fprintf(const struct tag *tag_enum, const struct conf_fprintf *conf, FILE *fp); int dwarves__init(uint16_t user_cacheline_size); diff --git a/dwarves_emit.c b/dwarves_emit.c index e6d96b2..7c13535 100644 --- a/dwarves_emit.c +++ b/dwarves_emit.c @@ -91,7 +91,7 @@ static int enumeration__emit_definitions(struct tag *tag, struct cu *cu, return 0; } - enumeration__fprintf(tag, cu, conf, fp); + enumeration__fprintf(tag, conf, fp); fputs(";\n", fp); type_emissions__add_definition(emissions, etype); return 1; diff --git a/dwarves_fprintf.c b/dwarves_fprintf.c index e9fb3d5..300cdc3 100644 --- a/dwarves_fprintf.c +++ b/dwarves_fprintf.c @@ -326,7 +326,7 @@ size_t typedef__fprintf(const struct tag *tag, const struct cu *cu, struct conf_fprintf tconf = *pconf; tconf.suffix = type__name(type); - return fprintf(fp, "typedef ") + enumeration__fprintf(tag_type, cu, &tconf, fp); + return fprintf(fp, "typedef ") + enumeration__fprintf(tag_type, &tconf, fp); } } @@ -379,8 +379,7 @@ out: return type->max_tag_name_len; } -size_t enumeration__fprintf(const struct tag *tag, const struct cu *cu, - const struct conf_fprintf *conf, FILE *fp) +size_t enumeration__fprintf(const struct tag *tag, const struct conf_fprintf *conf, FILE *fp) { struct type *type = tag__type(tag); struct enumerator *pos; @@ -813,7 +812,7 @@ print_default: if (type__name(ctype) != NULL) printed += fprintf(fp, "enum %-*s %s", tconf.type_spacing - 5, type__name(ctype), name); else - printed += enumeration__fprintf(type, cu, &tconf, fp); + printed += enumeration__fprintf(type, &tconf, fp); break; } out: @@ -1872,7 +1871,7 @@ size_t tag__fprintf(struct tag *tag, const struct cu *cu, printed += array_type__fprintf(tag, cu, "array", pconf, fp); break; case DW_TAG_enumeration_type: - printed += enumeration__fprintf(tag, cu, pconf, fp); + printed += enumeration__fprintf(tag, pconf, fp); break; case DW_TAG_typedef: printed += typedef__fprintf(tag, cu, pconf, fp);