diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-04-08 17:31:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-04-08 17:31:12 +0000 |
| commit | c2ae798ae2b3f9dbc4bbc67abe109c5a7f9c1631 (patch) | |
| tree | 88e85fa63df7633eb99f26c49222b1a379080f23 /epan/uat.c | |
| parent | f0eeb0bdf1a1a5a88519352e3a0370a27f213155 (diff) | |
More size_t fixes.
svn path=/trunk/; revision=28000
Diffstat (limited to 'epan/uat.c')
| -rw-r--r-- | epan/uat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/uat.c b/epan/uat.c index 6b8e7ae58e..c65d301217 100644 --- a/epan/uat.c +++ b/epan/uat.c @@ -92,7 +92,7 @@ uat_t* uat_new(const char* name, uat->update_cb = update_cb; uat->free_cb = free_cb; uat->fields = flds_array; - uat->user_data = g_array_new(FALSE,FALSE,uat->record_size); + uat->user_data = g_array_new(FALSE,FALSE,(guint)uat->record_size); uat->changed = FALSE; uat->loaded = FALSE; uat->rep = NULL; @@ -126,7 +126,7 @@ void* uat_add_record(uat_t* uat, const void* data) { rec = uat->user_data->data + (uat->record_size * (uat->user_data->len-1)); if (uat->copy_cb) { - uat->copy_cb(rec, data, uat->record_size); + uat->copy_cb(rec, data, (unsigned int) uat->record_size); } UAT_UPDATE(uat); @@ -135,7 +135,7 @@ void* uat_add_record(uat_t* uat, const void* data) { } void uat_swap(uat_t* uat, guint a, guint b) { - guint s = uat->record_size; + size_t s = uat->record_size; void* tmp = ep_alloc(s); g_assert( a < uat->user_data->len && b < uat->user_data->len ); @@ -326,14 +326,14 @@ void uat_clear(uat_t* uat) { } void* uat_dup(uat_t* uat, guint* len_p) { - guint size = (uat->record_size * uat->user_data->len); + guint size = (guint) (uat->record_size * uat->user_data->len); *len_p = size; return size ? g_memdup(uat->user_data->data,size) : NULL ; } void* uat_se_dup(uat_t* uat, guint* len_p) { - guint size = (uat->record_size * uat->user_data->len); - *len_p = size; + guint size = (guint) (uat->record_size * uat->user_data->len); + *len_p = (guint) size; return size ? se_memdup(uat->user_data->data,size) : NULL ; } |