diff options
| -rw-r--r-- | epan/guid-utils.c | 2 | ||||
| -rw-r--r-- | epan/sigcomp_state_hdlr.c | 2 | ||||
| -rw-r--r-- | epan/to_str.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/epan/guid-utils.c b/epan/guid-utils.c index 1b72db0bed..cbe73a2896 100644 --- a/epan/guid-utils.c +++ b/epan/guid-utils.c @@ -114,7 +114,7 @@ guids_add_guid(e_guid_t *guid, const gchar *name) guidkey[0].length=4; guidkey[1].length=0; - pe_tree_insert32_array(guid_to_name_tree, &guidkey[0], name); + pe_tree_insert32_array(guid_to_name_tree, &guidkey[0], (gchar *) name); } diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c index bc9550e6b0..26e01f4e10 100644 --- a/epan/sigcomp_state_hdlr.c +++ b/epan/sigcomp_state_hdlr.c @@ -546,7 +546,7 @@ int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint16 p_id_ /* debug *g_warning(" state_begin %u state_address %u",state_begin , *state_address); */ - while ( n < (state_begin + *state_length + 8) && n < UDVM_MEMORY_SIZE ){ + while ( (gint32) n < (state_begin + *state_length + 8) && n < UDVM_MEMORY_SIZE ){ buff[k] = state_buff[n]; /* debug g_warning(" Loading 0x%x at address %u",buff[k] , k); diff --git a/epan/to_str.c b/epan/to_str.c index ac831141dd..f0cd96562e 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -629,7 +629,7 @@ rel_time_to_str(nstime_t *rel_time) (the seconds part should be zero in that case), stick a "-" in front of the entire time stamp. */ sign = ""; - time = rel_time->secs; + time = (gint) rel_time->secs; nsec = rel_time->nsecs; if (time == 0 && nsec == 0) { g_snprintf(buf, 1+TIME_SECS_LEN+1+6+1, "0.000000000 seconds"); @@ -644,7 +644,7 @@ rel_time_to_str(nstime_t *rel_time) * or zero; if it's not, the time stamp is bogus, * with a positive seconds and negative microseconds. */ - time = -rel_time->secs; + time = (gint) -rel_time->secs; } time_secs_to_str_buf(time, nsec, TRUE, p, 1+TIME_SECS_LEN+1+6+1); @@ -663,7 +663,7 @@ rel_time_to_secs_str(nstime_t *rel_time) buf=ep_alloc(REL_TIME_SECS_LEN); - display_signed_time(buf, REL_TIME_SECS_LEN, rel_time->secs, + display_signed_time(buf, REL_TIME_SECS_LEN, (gint32) rel_time->secs, rel_time->nsecs, NSECS); return buf; } |