diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-08 23:16:06 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-08 23:16:06 +0000 |
| commit | f91eba752b3e34489951e507c54df36fee1feee4 (patch) | |
| tree | f877c8a4726be1654389b4408a048f7ddd3e5eb4 /epan/uat.h | |
| parent | 2b0797a3618218d2d08a04fcbdd9261657af153a (diff) | |
| download | wireshark-f91eba752b3e34489951e507c54df36fee1feee4.tar.gz | |
Fix some warnings: cast discards `__attribute__((const))' qualifier from pointer target type
svn path=/trunk/; revision=53875
Diffstat (limited to 'epan/uat.h')
| -rw-r--r-- | epan/uat.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/uat.h b/epan/uat.h index dc2f09e10c..682c4b1e2c 100644 --- a/epan/uat.h +++ b/epan/uat.h @@ -500,16 +500,16 @@ static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, g guint i; \ char* str = ep_strndup(buf,len); \ const char* cstr; ((rec_t*)rec)->field_name = default_val; \ - for(i=0; ( cstr = ((value_string*)vs)[i].strptr ) ;i++) { \ + for(i=0; ( cstr = ((const value_string*)vs)[i].strptr ) ;i++) { \ if (g_str_equal(cstr,str)) { \ - ((rec_t*)rec)->field_name = (default_t)((value_string*)vs)[i].value; return; } } } \ + ((rec_t*)rec)->field_name = (default_t)((const value_string*)vs)[i].value; return; } } } \ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out_ptr, unsigned* out_len, const void* vs, const void* u2 _U_) {\ guint i; \ *out_ptr = ep_strdup(default_str); \ *out_len = (unsigned)strlen(default_str);\ - for(i=0;((value_string*)vs)[i].strptr;i++) { \ - if ( ((value_string*)vs)[i].value == ((rec_t*)rec)->field_name ) { \ - *out_ptr = ep_strdup(((value_string*)vs)[i].strptr); \ + for(i=0;((const value_string*)vs)[i].strptr;i++) { \ + if ( ((const value_string*)vs)[i].value == ((rec_t*)rec)->field_name ) { \ + *out_ptr = ep_strdup(((const value_string*)vs)[i].strptr); \ *out_len = (unsigned)strlen(*out_ptr); return; } } } #define UAT_VS_CSTRING_DEF(basename,field_name,rec_t,default_val,default_str) \ @@ -517,9 +517,9 @@ static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, g guint i; \ char* str = ep_strndup(buf,len); \ const char* cstr; ((rec_t*)rec)->field_name = default_val; \ - for(i=0; ( cstr = ((value_string*)vs)[i].strptr ) ;i++) { \ + for(i=0; ( cstr = ((const value_string*)vs)[i].strptr ) ;i++) { \ if (g_str_equal(cstr,str)) { \ - ((rec_t*)rec)->field_name = g_strdup(((value_string*)vs)[i].strptr); return; } } } \ + ((rec_t*)rec)->field_name = g_strdup(((const value_string*)vs)[i].strptr); return; } } } \ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out_ptr, unsigned* out_len, const void* vs _U_, const void* u2 _U_) {\ if (((rec_t*)rec)->field_name ) { \ *out_ptr = (((rec_t*)rec)->field_name); \ |