aboutsummaryrefslogtreecommitdiffstats
path: root/epan/uat.c
diff options
context:
space:
mode:
authorLuis Ontanon <luis.ontanon@gmail.com>2007-01-29 04:47:58 +0000
committerLuis Ontanon <luis.ontanon@gmail.com>2007-01-29 04:47:58 +0000
commit5af746016a389752de71b5efbd678318099471bc (patch)
treeba6d9b74790918fc71f3b980697548ad50b6e851 /epan/uat.c
parentc01304b04d4aa0c14c1ec60f7fa325f2bcbb225a (diff)
now it is operational.
svn path=/trunk/; revision=20595
Diffstat (limited to 'epan/uat.c')
-rw-r--r--epan/uat.c26
1 files changed, 25 insertions, 1 deletions
diff --git a/epan/uat.c b/epan/uat.c
index 41c911b90e..93bf611753 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -1,9 +1,30 @@
/*
* uat.c
*
+ * $Id$
+ *
* User Accessible Tables
* Mantain an array of user accessible data strucures
*
+ * (c) 2007, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 2001 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -108,6 +129,7 @@ uat_t* uat_new(const char* uat_name,
uat_copy_cb_t copy_cb,
uat_update_cb_t update_cb,
uat_free_cb_t free_cb,
+ char** error,
...) {
uat_t* uat = uat_start(uat_name, size, filename, data_ptr, numitems_ptr, copy_cb, update_cb, free_cb);
va_list ap;
@@ -116,7 +138,7 @@ uat_t* uat_new(const char* uat_name,
uat_fld_chk_cb_t chk_cb;
uat_fld_set_cb_t set_cb;
uat_fld_tostr_cb_t tostr_cb;
- va_start(ap,free_cb);
+ va_start(ap,error);
name = va_arg(ap,char*);
@@ -135,6 +157,8 @@ uat_t* uat_new(const char* uat_name,
uat_finalize(uat);
+ uat_load(uat,error);
+
return uat;
}