diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-09-27 06:09:14 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-09-27 06:09:14 +0000 |
commit | 0539569e1b5d01b9b4357ae872dc5f77c8ff7baf (patch) | |
tree | ac0aa60ed9e041d7c315e045debb058f25254279 | |
parent | 0f2584c4d2da10bc952eb2bf24dd524360e17d10 (diff) |
get rid of warnings about qualifier discarding
svn path=/trunk/; revision=16017
-rw-r--r-- | epan/except.c | 6 | ||||
-rw-r--r-- | epan/except.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/epan/except.c b/epan/except.c index 3aa8d84908..692127fa16 100644 --- a/epan/except.c +++ b/epan/except.c @@ -259,7 +259,7 @@ void except_rethrow(except_t *except) do_throw(except); } -void except_throw(long group, long code, char *msg) +void except_throw(long group, long code, const char *msg) { except_t except; @@ -271,7 +271,7 @@ void except_throw(long group, long code, char *msg) do_throw(&except); } -void except_throwd(long group, long code, char *msg, void *data) +void except_throwd(long group, long code, const char *msg, void *data) { except_t except; @@ -321,7 +321,7 @@ unsigned long except_group(except_t *ex) return ex->except_id.except_group; } -char *except_message(except_t *ex) +const char *except_message(except_t *ex) { return ex->except_message; } diff --git a/epan/except.h b/epan/except.h index 741cd0eabe..378441df47 100644 --- a/epan/except.h +++ b/epan/except.h @@ -51,7 +51,7 @@ typedef struct { typedef struct { except_id_t volatile except_id; - char *volatile except_message; + const char *volatile except_message; void *volatile except_dyndata; } except_t; @@ -91,13 +91,13 @@ extern struct except_stacknode *except_pop(void); extern int except_init(void); extern void except_deinit(void); extern void except_rethrow(except_t *); -extern void except_throw(long, long, char *); -extern void except_throwd(long, long, char *, void *); +extern void except_throw(long, long, const char *); +extern void except_throwd(long, long, const char *, void *); extern void except_throwf(long, long, const char *, ...); extern void (*except_unhandled_catcher(void (*)(except_t *)))(except_t *); extern unsigned long except_code(except_t *); extern unsigned long except_group(except_t *); -extern char *except_message(except_t *); +extern const char *except_message(except_t *); extern void *except_data(except_t *); extern void *except_take_data(except_t *); extern void except_set_allocator(void *(*)(size_t), void (*)(void *)); |