Have the windows buildot compiling again.

svn path=/trunk/; revision=20742

4 files changed, 23 insertions, 6 deletions

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index df324fa4fa..e0bff7b318 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3728,9 +3728,10 @@ static void snmp_users_free_cb(void* p) {
 
 static void snmp_users_update_cb(void* p _U_, char** err) {
 	snmp_ue_assoc_t* ue = p;
-	*err = NULL;
 	GString* es = g_string_new("");
-	
+
+	*err = NULL;
+
 	if (! ue->user.userName.len) g_string_append(es,"no userName, ");
 	if (ue->user.authPassword.len < 8) g_string_sprintfa(es,"short authPassword (%d), ", ue->user.authPassword.len);
 	if (ue->user.privPassword.len < 8) g_string_sprintfa(es,"short privPassword (%d), ", ue->user.privPassword.len);
@@ -4147,7 +4148,7 @@ void proto_register_snmp(void) {
         "snmp.T_operation", HFILL }},
 
 /*--- End of included file: packet-snmp-hfarr.c ---*/
-#line 2057 "packet-snmp-template.c"
+#line 2058 "packet-snmp-template.c"
   };
 
   /* List of subtrees */
@@ -4188,7 +4189,7 @@ void proto_register_snmp(void) {
     &ett_snmp_RReqPDU,
 
 /*--- End of included file: packet-snmp-ettarr.c ---*/
-#line 2069 "packet-snmp-template.c"
+#line 2070 "packet-snmp-template.c"
   };
   module_t *snmp_module;
   static uat_field_t fields[] = {
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 7a523e7e46..062b622377 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -145,6 +145,8 @@ void proto_reg_handoff_user_encap(void)
 
 void proto_register_user_encap(void)
 {
+	module_t *module;
+
 	static uat_field_t user_flds[] = {
 		UAT_FLD_VS(user_encap,encap,user_dlts),
 		UAT_FLD_PROTO(user_encap,payload_proto),
@@ -155,10 +157,10 @@ void proto_register_user_encap(void)
 		UAT_END_FIELDS
 	};
 	
-	proto_user_encap = proto_register_protocol("DLT User","DLT_USER","user_dlt");
-	module_t *module = prefs_register_protocol(proto_user_encap, NULL);
 	
+	proto_user_encap = proto_register_protocol("DLT User","DLT_USER","user_dlt");
 	
+	module = prefs_register_protocol(proto_user_encap, NULL);
 	
 	encaps_uat = uat_new("User DLTs Table",
 						 sizeof(user_encap_t),
diff --git a/epan/uat.c b/epan/uat.c
index e911163c6b..38541272ca 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -275,6 +275,16 @@ void uat_cleanup(void) {
 	g_ptr_array_free(all_uats,TRUE);
 }
 
+
+void uat_foreach_table(uat_cb_t cb,void* user_data) {
+	guint i;
+	
+	for (i=0; i < all_uats->len; i++)
+		cb(g_ptr_array_index(all_uats,i), user_data);
+	
+}	
+
+
 void uat_load_all(void) {
 	guint i;
 	gchar* err;
@@ -291,6 +301,7 @@ void uat_load_all(void) {
 	}
 }
 
+
 gboolean uat_fld_chk_str(void* u1 _U_, const char* strptr, unsigned len _U_, void* u2 _U_, void* u3 _U_, char** err) {
 	if (strptr == NULL) {
 		*err = "NULL pointer";
diff --git a/epan/uat.h b/epan/uat.h
index d980fbc08a..4390fbe41b 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -263,6 +263,9 @@ gboolean uat_fld_chk_enum(void*, const char*, unsigned, void*, void*, char**);
 #define CHK_STR_IS_DECL(what) \
 gboolean uat_fld_chk_str_ ## what (void*, const char*, unsigned, void*, void*, char**)
 
+typedef void (*uat_cb_t)(void* uat,void* user_data);
+void uat_foreach_table(uat_cb_t cb,void* user_data);
+
 /* Some strings entirely made of ... already declared */
 CHK_STR_IS_DECL(isprint);
 CHK_STR_IS_DECL(isalpha);