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?).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34694 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index a7bfa4c124bf0c0229261ddd9d4925e5acf483df..2aebc0998a5bc6f5c8bde7250455bddbb74f4cb5 100644 (file)
--- a/asn1/ess/packet-ess-template.c
+++ b/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;

diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 5b5a4aed993474026e182610c5e6548bf35e23ed..40d1f4193e89877fe9f954a41bf17f4150e4bd10 100644 (file)
--- a/epan/dfilter/dfilter-macro.c
+++ b/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;
 

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index c7e090d8fa761dd56b9f5dbe6aa7e100801e9141..037ea32588d2a4626e77c033821e04ec4688e1c3 100644 (file)
--- a/epan/dissectors/packet-ber.c
+++ b/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;

diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 44404a7e4498911942dbaeab7789e7251c87bab8..4c9b0a85c0ef47b5a9183bc741029db076df1805 100644 (file)
--- a/epan/dissectors/packet-ess.c
+++ b/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;

diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 3f5e14236e248df9d9a39d92cfb07094a0696d00..dbc443225caf694dd65a7fd1cd129b1a4b42d1fe 100644 (file)
--- a/epan/dissectors/packet-http.c
+++ b/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;

diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index b5f57027c96e88b174be31bada5e79ed2adc6f1e..5a75fadc880417ede7d7c11234d10468415a511a 100644 (file)
--- a/epan/dissectors/packet-k12.c
+++ b/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;

diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 4652e229fe7c85635b7b064ae8d89e3043245998..ca4cbce9011a14385626a19845829f33c9f3dc89 100644 (file)
--- a/epan/dissectors/packet-mac-lte.c
+++ b/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;

diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index f1bd1646acaba133a23d8c7f54549fa6c256a81b..39a609e8e08292456c22c1181ec7d43aad4a0470 100644 (file)
--- a/epan/dissectors/packet-sccp.c
+++ b/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;
 

diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 7e2482d09707da765cad97a8e9a6e525703504d3..7b7d93d3fc9cca23ba86b600b32b8e220733500d 100644 (file)
--- a/epan/dissectors/packet-user_encap.c
+++ b/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;

diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index 5c00ac1f7f2bcff9077794845166ced1f4712811..b99831666817a2275e9650b62ea4ed353b14818c 100644 (file)
--- a/epan/dissectors/packet-zbee-security.c
+++ b/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;
 

diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index a1903467a4591a20954fec68c2622cf3f4560705..93499cae06f5e7d13c58249e856193b3e252e57b 100644 (file)
--- a/epan/geoip_db.c
+++ b/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;
 

diff --git a/epan/oids.c b/epan/oids.c
index 2d1a3cc01c767a992fa66bb18357c36c72f04ceb..7da2e5ccb5e639b42f5792b6116984d91e4e4f5d 100644 (file)
--- a/epan/oids.c
+++ b/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;
 

diff --git a/epan/uat.h b/epan/uat.h
index f5523aea9280a8d7486d4f49f9c274ff77543fc8..4d85f98d04e4852de8859110ff72626563398a21 100644 (file)
--- a/epan/uat.h
+++ b/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);
 
 /*
  *

diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c
index 070a605861a78b14f2a1971c89ee2f7a46571b42..307fb91f38b61a22ece1c9528865a6d73434149a 100644 (file)
--- a/gtk/uat_gui.c
+++ b/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) {