diff options
| -rw-r--r-- | src/libstrongswan/enum.c | 19 | ||||
| -rw-r--r-- | src/libstrongswan/enum.h | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/libstrongswan/enum.c b/src/libstrongswan/enum.c index c3dd2e549..ade7c16a1 100644 --- a/src/libstrongswan/enum.c +++ b/src/libstrongswan/enum.c @@ -30,7 +30,7 @@ /** * get the name of an enum value in a enum_name_t list */ -static char *enum_name(enum_name_t *e, long val) +static char *enum_name(enum_name_t *e, int val) { do { @@ -49,16 +49,19 @@ static char *enum_name(enum_name_t *e, long val) static int print_enum(FILE *stream, const struct printf_info *info, const void *const *args) { - enum_name_t *ed = *((void**)(args[0])); - long val = *((long*)(args[1])); - char *name; - - name = enum_name(ed, val); + enum_name_t *ed = *((enum_name_t**)(args[0])); + int val = *((int*)(args[1])); + + char *name = enum_name(ed, val); + if (name == NULL) { - return fprintf(stream, "(unknown enum value: %ld)", val); + return fprintf(stream, "(%d)", val); + } + else + { + return fprintf(stream, "%s", name); } - return fprintf(stream, "%s", name); } /** diff --git a/src/libstrongswan/enum.h b/src/libstrongswan/enum.h index 3b90ce945..cd06e424b 100644 --- a/src/libstrongswan/enum.h +++ b/src/libstrongswan/enum.h @@ -52,9 +52,9 @@ typedef struct enum_name_t enum_name_t; */ struct enum_name_t { /** value of the first enum string */ - long first; + int first; /** value of the last enum string */ - long last; + int last; /** next enum_name_t in list */ enum_name_t *next; /** array of strings containing names from first to last */ |