diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 06:00:22 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 06:00:22 +0000 |
commit | f12ef203b39206726a435590e64f8014f6b84ec9 (patch) | |
tree | 5f7ad3fa3f69796fab0d5958f17c0d873cda9258 | |
parent | d8310ff499f128fddcce7d8d7806a36c94684b82 (diff) |
Revert 34191 and add some casts instead
svn path=/trunk/; revision=34193
-rw-r--r-- | epan/epan.c | 6 | ||||
-rw-r--r-- | epan/epan.h | 2 | ||||
-rw-r--r-- | epan/proto.c | 35 | ||||
-rw-r--r-- | epan/proto.h | 6 |
4 files changed, 24 insertions, 25 deletions
diff --git a/epan/epan.c b/epan/epan.c index e68f253411..236ea20b92 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -235,9 +235,9 @@ epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t* dfcode) /* ----------------------- */ const gchar * epan_custom_set(epan_dissect_t *edt, int field_id, - gint occurrence, - gchar *result, - gchar *expr, const gsize size ) + gint occurrence, + gchar *result, + gchar *expr, const int size ) { return proto_custom_set(edt->tree, field_id, occurrence, result, expr, size); } diff --git a/epan/epan.h b/epan/epan.h index bc1d44939a..f489c6de4e 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -125,7 +125,7 @@ epan_dissect_free(epan_dissect_t* edt); /** Sets custom column */ const gchar * epan_custom_set(epan_dissect_t *edt, int id, gint occurrence, - gchar *result, gchar *expr, const gsize size); + gchar *result, gchar *expr, const int size); /** * Get compile-time information for libraries used by libwireshark. diff --git a/epan/proto.c b/epan/proto.c index cf9d41952e..376776907c 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -3419,7 +3419,7 @@ proto_tree_set_representation(proto_item *pi, const char *format, va_list ap) /* -------------------------- */ const gchar * proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, - gchar *result, gchar *expr, const gsize size) + gchar *result, gchar *expr, const int size) { guint32 u_integer; gint32 integer; @@ -3430,8 +3430,7 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, guint32 n_addr; /* network-order IPv4 address */ const true_false_string *tfstring; - int len, last, i; - gsize offset = 0; + int len, last, i, offset=0; GPtrArray *finfos; field_info *finfo = NULL; header_field_info* hfinfo; @@ -3488,17 +3487,17 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, case FT_UINT_BYTES: case FT_BYTES: bytes = fvalue_get(&finfo->value); - offset += g_strlcpy(result+offset, bytes_to_str(bytes, fvalue_length(&finfo->value)), size-offset); + offset += (int)g_strlcpy(result+offset, bytes_to_str(bytes, fvalue_length(&finfo->value)), size-offset); break; case FT_ABSOLUTE_TIME: - offset += g_strlcpy(result+offset, + offset += (int)g_strlcpy(result+offset, abs_time_to_str(fvalue_get(&finfo->value), hfinfo->display, TRUE), size-offset); break; case FT_RELATIVE_TIME: - offset += g_strlcpy(result+offset, rel_time_to_secs_str(fvalue_get(&finfo->value)), size-offset); + offset += (int)g_strlcpy(result+offset, rel_time_to_secs_str(fvalue_get(&finfo->value)), size-offset); break; case FT_BOOLEAN: @@ -3507,7 +3506,7 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, if (hfinfo->strings) { tfstring = (const struct true_false_string*) hfinfo->strings; } - offset += g_strlcpy(result+offset, u_integer ? tfstring->true_string : tfstring->false_string, size-offset); + offset += (int)g_strlcpy(result+offset, u_integer ? tfstring->true_string : tfstring->false_string, size-offset); break; case FT_UINT8: @@ -3518,11 +3517,11 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, u_integer = fvalue_get_uinteger(&finfo->value); if (hfinfo->strings) { if (hfinfo->display & BASE_RANGE_STRING) { - offset += g_strlcpy(result+offset, rval_to_str(u_integer, hfinfo->strings, "%u"), size-offset); + offset += (int)g_strlcpy(result+offset, rval_to_str(u_integer, hfinfo->strings, "%u"), size-offset); } else if (hfinfo->display & BASE_EXT_STRING) { - offset += g_strlcpy(result+offset, val_to_str_ext(u_integer, (value_string_ext *) (hfinfo->strings), "%u"), size-offset); + offset += (int)g_strlcpy(result+offset, val_to_str_ext(u_integer, (value_string_ext *) (hfinfo->strings), "%u"), size-offset); } else { - offset += g_strlcpy(result+offset, val_to_str(u_integer, cVALS(hfinfo->strings), "%u"), size-offset); + offset += (int)g_strlcpy(result+offset, val_to_str(u_integer, cVALS(hfinfo->strings), "%u"), size-offset); } } else if (IS_BASE_DUAL(hfinfo->display)) { g_snprintf(result+offset, size-offset, hfinfo_uint_value_format(hfinfo), u_integer, u_integer); @@ -3547,11 +3546,11 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, integer = fvalue_get_sinteger(&finfo->value); if (hfinfo->strings) { if (hfinfo->display & BASE_RANGE_STRING) { - offset += g_strlcpy(result+offset, rval_to_str(integer, hfinfo->strings, "%d"), size-offset); + offset += (int)g_strlcpy(result+offset, rval_to_str(integer, hfinfo->strings, "%d"), size-offset); } else if (hfinfo->display & BASE_EXT_STRING) { - offset += g_strlcpy(result+offset, val_to_str_ext(integer, (value_string_ext *) (hfinfo->strings), "%d"), size-offset); + offset += (int)g_strlcpy(result+offset, val_to_str_ext(integer, (value_string_ext *) (hfinfo->strings), "%d"), size-offset); } else { - offset += g_strlcpy(result+offset, val_to_str(integer, cVALS(hfinfo->strings), "%d"), size-offset); + offset += (int)g_strlcpy(result+offset, val_to_str(integer, cVALS(hfinfo->strings), "%d"), size-offset); } } else if (IS_BASE_DUAL(hfinfo->display)) { g_snprintf(result+offset, size-offset, hfinfo_int_value_format(hfinfo), integer, integer); @@ -3565,7 +3564,7 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, case FT_IPv4: ipv4 = fvalue_get(&finfo->value); n_addr = ipv4_get_net_order_addr(ipv4); - offset += g_strlcpy(result+offset, ip_to_str((guint8 *)&n_addr), size-offset); + offset += (int)g_strlcpy(result+offset, ip_to_str((guint8 *)&n_addr), size-offset); break; case FT_IPv6: @@ -3576,16 +3575,16 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, break; case FT_ETHER: - offset += g_strlcpy(result+offset, bytes_to_str_punct(fvalue_get(&finfo->value), 6, ':'), size-offset); + offset += (int)g_strlcpy(result+offset, bytes_to_str_punct(fvalue_get(&finfo->value), 6, ':'), size-offset); break; case FT_GUID: - offset += g_strlcpy(result+offset, guid_to_str((e_guid_t *)fvalue_get(&finfo->value)), size-offset); + offset += (int)g_strlcpy(result+offset, guid_to_str((e_guid_t *)fvalue_get(&finfo->value)), size-offset); break; case FT_OID: bytes = fvalue_get(&finfo->value); - offset += g_strlcpy(result+offset, oid_resolved_from_encoded(bytes, fvalue_length(&finfo->value)), size-offset); + offset += (int)g_strlcpy(result+offset, oid_resolved_from_encoded(bytes, fvalue_length(&finfo->value)), size-offset); break; case FT_FLOAT: @@ -3603,7 +3602,7 @@ proto_custom_set(proto_tree* tree, const int field_id, gint occurrence, case FT_STRINGZ: case FT_UINT_STRING: bytes = fvalue_get(&finfo->value); - offset += g_strlcpy(result+offset, format_text(bytes, strlen(bytes)), size-offset); + offset += (int)g_strlcpy(result+offset, format_text(bytes, strlen(bytes)), size-offset); break; case FT_IPXNET: /*XXX really No column custom ?*/ diff --git a/epan/proto.h b/epan/proto.h index ef607079fb..08e515d633 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -1828,9 +1828,9 @@ proto_check_field_name(const gchar *field_name); @param size the size of the string buffer */ const gchar * proto_custom_set(proto_tree* tree, const int field_id, - gint occurrence, - gchar *result, - gchar *expr, const gsize size ); + gint occurrence, + gchar *result, + gchar *expr, const int size ); #ifdef __cplusplus } |