value_string.c(71) : warning C4090: 'return' : different 'const' qualifiers

svn path=/trunk/; revision=14784

1 files changed, 5 insertions, 1 deletions

diff --git a/epan/value_string.c b/epan/value_string.c
index f2e6b96147..e7aa117159 100644
--- a/epan/value_string.c
+++ b/epan/value_string.c
@@ -49,6 +49,7 @@ val_to_str(guint32 val, const value_string *vs, const char *fmt) {
   ret = match_strval(val, vs);
   if (ret != NULL)
     return ret;
+
   if (cur == &str[0][0]) {
     cur = &str[1][0];
   } else if (cur == &str[1][0]) {
@@ -68,7 +69,10 @@ match_strval(guint32 val, const value_string *vs) {
 
   while (vs[i].strptr) {
     if (vs[i].value == val)
-      return(vs[i].strptr);
+      /* XXX - the correct implementation would be to use the return type:
+         "const gchar *", but this would require to change most calls of this 
+         function which are (directly and indirectly) *a lot* */
+      return( (gchar *) vs[i].strptr);
     i++;
   }