Make the third argument to a UAT copy callback a size_t (not that any of

the callbacks we have use that argument - is it really needed?).

svn path=/trunk/; revision=34694

asn1/ess/packet-ess-template.c

@@ -76,7 +76,7 @@ UAT_DEC_CB_DEF(ess_category_attributes, lacv, ess_category_attributes_t);
 UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t);
 
 static void *
-ess_copy_cb(void *dest, const void *orig, unsigned len _U_)
+ess_copy_cb(void *dest, const void *orig, size_t len _U_)
 {
   ess_category_attributes_t *u = dest;
   const ess_category_attributes_t *o = orig;

epan/dfilter/dfilter-macro.c

@@ -501,7 +501,7 @@ static void macro_free(void* r) {
 	g_free(m->args_pos);
 }
 
-static void* macro_copy(void* dest, const void* orig, unsigned len _U_) {
+static void* macro_copy(void* dest, const void* orig, size_t len _U_) {
 	dfilter_macro_t* d = dest;
 	const dfilter_macro_t* m = orig;
 

epan/dissectors/packet-ber.c

@@ -281,7 +281,7 @@ static const fragment_items octet_string_frag_items = {
 };
 
 static void *
-oid_copy_cb(void *dest, const void *orig, unsigned len _U_)
+oid_copy_cb(void *dest, const void *orig, size_t len _U_)
 {
 	oid_user_t *u = dest;
 	const oid_user_t *o = orig;

epan/dissectors/packet-ess.c

@@ -217,7 +217,7 @@ UAT_DEC_CB_DEF(ess_category_attributes, lacv, ess_category_attributes_t);
 UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t);
 
 static void *
-ess_copy_cb(void *dest, const void *orig, unsigned len _U_)
+ess_copy_cb(void *dest, const void *orig, size_t len _U_)
 {
   ess_category_attributes_t *u = dest;
   const ess_category_attributes_t *o = orig;

epan/dissectors/packet-http.c

@@ -147,7 +147,7 @@ header_fields_update_cb(void* r, const char** err)
 }
 
 static void *
-header_fields_copy_cb(void* n, const void* o, unsigned siz _U_)
+header_fields_copy_cb(void* n, const void* o, size_t siz _U_)
 {
     header_field_t* new_rec = n;
     const header_field_t* old_rec = o;

epan/dissectors/packet-k12.c

@@ -332,7 +332,7 @@ k12_update_cb(void* r, const char** err)
 }
 
 static void*
-k12_copy_cb(void* dest, const void* orig, unsigned len _U_)
+k12_copy_cb(void* dest, const void* orig, size_t len _U_)
 {
 	k12_handles_t* d = dest;
 	const k12_handles_t* o = orig;

epan/dissectors/packet-mac-lte.c

@@ -3196,7 +3196,7 @@ mac_lte_init_protocol(void)
 }
 
 
-static void* lcid_drb_mapping_copy_cb(void* dest, const void* orig, unsigned len _U_)
+static void* lcid_drb_mapping_copy_cb(void* dest, const void* orig, size_t len _U_)
 {
     const lcid_drb_mapping_t *o = orig;
     lcid_drb_mapping_t *d = dest;

epan/dissectors/packet-sccp.c

@@ -2891,7 +2891,7 @@ static void sccp_users_update_cb(void* r, const char** err _U_) {
 	u->handlep = &data_handle;
 }
 
-static void* sccp_users_copy_cb(void* n, const void* o, unsigned siz _U_) {
+static void* sccp_users_copy_cb(void* n, const void* o, size_t siz _U_) {
 	const sccp_user_t* u = o;
 	sccp_user_t* un = n;
 

epan/dissectors/packet-user_encap.c

@@ -127,7 +127,7 @@ static void dissect_user(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
 	}
 }
 
-static void* user_copy_cb(void* dest, const void* orig, unsigned len _U_) 
+static void* user_copy_cb(void* dest, const void* orig, size_t len _U_) 
 {
   const user_encap_t *o = orig;
   user_encap_t *d = dest;

epan/dissectors/packet-zbee-security.c

@@ -142,7 +142,7 @@ typedef struct _uat_key_record_t {
 static uat_key_record_t *uat_key_records = NULL;
 static guint             num_uat_key_records = 0;
 
-static void* uat_key_record_copy_cb(void* n, const void* o, unsigned siz _U_) {
+static void* uat_key_record_copy_cb(void* n, const void* o, size_t siz _U_) {
     uat_key_record_t* new_key = (uat_key_record_t *)n;
     const uat_key_record_t* old_key = (uat_key_record_t *)o;
 

epan/geoip_db.c

@@ -107,7 +107,7 @@ geoip_dat_scan_dir(const char *dirname) {
 }
 
 /* UAT callbacks */
-static void* geoip_db_path_copy_cb(void* dest, const void* orig, unsigned len _U_) {
+static void* geoip_db_path_copy_cb(void* dest, const void* orig, size_t len _U_) {
 	const geoip_db_path_t *m = orig;
 	geoip_db_path_t *d = dest;
 

epan/oids.c

@@ -234,7 +234,7 @@ static void smi_error_handler(char *path, int line, int severity, char *msg, cha
 }
 
 
-static void* smi_mod_copy_cb(void* dest, const void* orig, unsigned len _U_) {
+static void* smi_mod_copy_cb(void* dest, const void* orig, size_t len _U_) {
 	const smi_module_t* m = orig;
 	smi_module_t* d = dest;
 

epan/uat.h

@@ -82,7 +82,7 @@ typedef void (*uat_post_update_cb_t)(void);
  * optional, memcpy will be used if not given
  * copy(dest,orig,len)
  */
-typedef void* (*uat_copy_cb_t)(void*, const void*, unsigned);
+typedef void* (*uat_copy_cb_t)(void*, const void*, size_t);
 
 /*
  *

gtk/uat_gui.c

@@ -425,7 +425,7 @@ static void uat_edit_dialog(uat_t* uat, gint row, gboolean copy) {
 	if (copy && row >= 0) {
 	  dd->rec = g_malloc0(uat->record_size);
 	  if (uat->copy_cb) {
-	    uat->copy_cb (dd->rec, UAT_INDEX_PTR(uat,row), (unsigned int) uat->record_size);
+	    uat->copy_cb (dd->rec, UAT_INDEX_PTR(uat,row), uat->record_size);
 	  }
 	  dd->is_new = TRUE;
 	} else if (row >= 0) {