aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Ontanon <luis.ontanon@gmail.com>2007-08-28 15:38:05 +0000
committerLuis Ontanon <luis.ontanon@gmail.com>2007-08-28 15:38:05 +0000
commit0c154e528a93f2f9bb552e3cd253208365af0dc7 (patch)
tree57fa04ea5916a98fa4b987d95ae541ac231cb76e
parentdfbac007529fc7ce0f6405d1a0ba30560cadf0b8 (diff)
Commit canges to uat_load.l, and initialize uat_t->loaded (not every system zeroes-out on malloc).
svn path=/trunk/; revision=22705
-rw-r--r--epan/uat.c1
-rw-r--r--epan/uat_load.l2
2 files changed, 2 insertions, 1 deletions
diff --git a/epan/uat.c b/epan/uat.c
index 20a4230543..1d3dd753af 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -84,6 +84,7 @@ uat_t* uat_new(const char* name,
uat->fields = flds_array;
uat->user_data = g_array_new(FALSE,FALSE,uat->record_size);
uat->changed = FALSE;
+ uat->loaded = FALSE;
uat->rep = NULL;
uat->free_rep = NULL;
uat->help = help;
diff --git a/epan/uat_load.l b/epan/uat_load.l
index e0b131a6f0..53175811bf 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -269,7 +269,7 @@ gboolean uat_load(uat_t* uat_in, char** err) {
yyrestart(NULL);
uat->changed = FALSE;
-
+ uat->loaded = TRUE;
if (error) {
UAT_UPDATE(uat);
*err = ep_strdup(error);