summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-02-08 09:06:08 +0000
committerGuy Harris <guy@alum.mit.edu>2013-02-08 09:06:08 +0000
commit922a57753b1e52c3f1e63554a4c88c173df86287 (patch)
tree794f0796085fbe04ba931b6275e2b0a6589571a5 /epan
parent1df459c41503e887f698fbd3101f95fb450ef1e6 (diff)
downloadwireshark-922a57753b1e52c3f1e63554a4c88c173df86287.tar.gz
Constify the second argument to uat_load(), to squelch some warnings.
svn path=/trunk/; revision=47560
Diffstat (limited to 'epan')
-rw-r--r--epan/uat.c2
-rw-r--r--epan/uat.h2
-rw-r--r--epan/uat_load.l2
3 files changed, 3 insertions, 3 deletions
diff --git a/epan/uat.c b/epan/uat.c
index e4b5ba235a..adf9988232 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -373,7 +373,7 @@ void uat_foreach_table(uat_cb_t cb,void* user_data) {
void uat_load_all(void) {
guint i;
- gchar* err;
+ const gchar* err;
for (i=0; i < all_uats->len; i++) {
uat_t* u = g_ptr_array_index(all_uats,i);
diff --git a/epan/uat.h b/epan/uat.h
index 6a50aeb3d8..efdc1b8c77 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -268,7 +268,7 @@ uat_t* uat_new(const char* name,
*
* @return TRUE on success, FALSE on failure.
*/
-gboolean uat_load(uat_t* uat_in, char** err);
+gboolean uat_load(uat_t* uat_in, const char** err);
/** Create or update a single uat entry using a string.
*
diff --git a/epan/uat_load.l b/epan/uat_load.l
index 83ee82a69b..f42ed376ad 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -273,7 +273,7 @@ comment #[^\n]*\n
gboolean
-uat_load(uat_t *uat_in, char **errx)
+uat_load(uat_t *uat_in, const char **errx)
{
gchar *fname = uat_get_actual_filename(uat_in, FALSE);