diff --git a/epan/guid-utils.c b/epan/guid-utils.c index c03a19f0f1..60fce072e3 100644 --- a/epan/guid-utils.c +++ b/epan/guid-utils.c @@ -71,7 +71,7 @@ ResolveWin32UUID(e_guid_t if_id, char *uuid_name, int uuid_name_max_len) if (RegQueryValueEx(hKey, NULL, NULL, NULL, (LPBYTE)reg_uuid_name, &uuid_max_size) == ERROR_SUCCESS && uuid_max_size <= MAX_PATH) { g_snprintf(uuid_name, uuid_name_max_len, "%s", utf_16to8(reg_uuid_name)); RegCloseKey(hKey); - return strlen(uuid_name); + return (int) strlen(uuid_name); } RegCloseKey(hKey); } diff --git a/epan/osi-utils.c b/epan/osi-utils.c index df613783b9..81e1a956a6 100644 --- a/epan/osi-utils.c +++ b/epan/osi-utils.c @@ -51,6 +51,7 @@ print_nsap_net( const guint8 *ad, int length ) return( cur ); } +/* XXX - Should these be converted to string buffers? */ void print_nsap_net_buf( const guint8 *ad, int length, gchar *buf, int buf_len) { @@ -64,14 +65,14 @@ print_nsap_net_buf( const guint8 *ad, int length, gchar *buf, int buf_len) } cur = buf; if ( ( length == RFC1237_NSAP_LEN ) || ( length == RFC1237_NSAP_LEN + 1 ) ) { - print_area_buf(ad, RFC1237_FULLAREA_LEN, cur, buf_len-(cur-buf)); + print_area_buf(ad, RFC1237_FULLAREA_LEN, cur, buf_len); cur += strlen( cur ); - print_system_id_buf( ad + RFC1237_FULLAREA_LEN, RFC1237_SYSTEMID_LEN, cur, buf_len-(cur-buf)); + print_system_id_buf( ad + RFC1237_FULLAREA_LEN, RFC1237_SYSTEMID_LEN, cur, (int) (buf_len-(cur-buf))); cur += strlen( cur ); - cur += g_snprintf(cur, buf_len-(cur-buf), "[%02x]", + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "[%02x]", ad[ RFC1237_FULLAREA_LEN + RFC1237_SYSTEMID_LEN ] ); if ( length == RFC1237_NSAP_LEN + 1 ) { - cur += g_snprintf(cur, buf_len-(cur-buf), "-%02x", ad[ length -1 ] ); + cur += g_snprintf(cur, (int) (buf_len-(cur-buf)), "-%02x", ad[ length -1 ] ); } } else { /* probably format as standard */ @@ -104,31 +105,31 @@ print_system_id_buf( const guint8 *ad, int length, gchar *buf, int buf_len) if ( ( 6 == length ) || /* System-ID */ ( 7 == length ) || /* LAN-ID */ ( 8 == length )) { /* LSP-ID */ - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x%02x.%02x%02x.%02x%02x", ad[0], ad[1], + cur += g_snprintf(cur, buf_len, "%02x%02x.%02x%02x.%02x%02x", ad[0], ad[1], ad[2], ad[3], ad[4], ad[5] ); if ( ( 7 == length ) || ( 8 == length )) { - cur += g_snprintf(cur, buf_len-(cur-buf), ".%02x", ad[6] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), ".%02x", ad[6] ); } if ( 8 == length ) { - cur += g_snprintf(cur, buf_len-(cur-buf), "-%02x", ad[7] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "-%02x", ad[7] ); } } else { tmp = 0; while ( tmp < length / 4 ) { /* 16 / 4 == 4 > four Octets left to print */ - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x.", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x.", ad[tmp++] ); } if ( 1 == tmp ) { /* Special case for Designated IS */ cur--; - g_snprintf(cur, buf_len-(cur-buf), ".%02x", ad[tmp] ); + g_snprintf(cur, (gulong) (buf_len-(cur-buf)), ".%02x", ad[tmp] ); } else { for ( ; tmp < length; ) { /* print the rest without dot */ - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); } } } @@ -174,13 +175,13 @@ print_area_buf(const guint8 *ad, int length, gchar *buf, int buf_len) * tests for (length == RFC1237_FULLAREA_LEN) or (length == RFC1237_FULLAREA_LEN + 1) */ - cur += g_snprintf(cur, buf_len-(cur-buf), "[%02x|%02x:%02x][%02x|%02x:%02x:%02x|%02x:%02x]", + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "[%02x|%02x:%02x][%02x|%02x:%02x:%02x|%02x:%02x]", ad[0], ad[1], ad[2], ad[3], ad[4], ad[5], ad[6], ad[7], ad[8] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "[%02x:%02x|%02x:%02x]", + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "[%02x:%02x|%02x:%02x]", ad[9], ad[10], ad[11], ad[12] ); if ( RFC1237_FULLAREA_LEN + 1 == length ) - g_snprintf(cur, buf_len-(cur-buf), "-[%02x]", ad[20] ); + g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "-[%02x]", ad[20] ); } else { /* print standard format */ if ( length == RFC1237_AREA_LEN ) { @@ -189,18 +190,18 @@ print_area_buf(const guint8 *ad, int length, gchar *buf, int buf_len) } if ( 4 < length ) { while ( tmp < length / 4 ) { /* 16/4==4 > four Octets left to print */ - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x.", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x.", ad[tmp++] ); } if ( 1 == tmp ) { /* Special case for Designated IS */ cur--; - g_snprintf(cur, buf_len-(cur-buf), "-%02x", ad[tmp] ); + g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "-%02x", ad[tmp] ); } else { for ( ; tmp < length; ) { /* print the rest without dot */ - cur += g_snprintf(cur, buf_len-(cur-buf), "%02x", ad[tmp++] ); + cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] ); } } } diff --git a/epan/packet.c b/epan/packet.c index dbf6953ab4..b06af10628 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -455,7 +455,7 @@ call_dissector_work(dissector_handle_t handle, tvbuff_t *tvb, saved_can_desegment = pinfo->can_desegment; if (pinfo->layer_names != NULL) - saved_layer_names_len = pinfo->layer_names->len; + saved_layer_names_len = (gint) pinfo->layer_names->len; /* * can_desegment is set to 2 by anyone which offers the @@ -1571,7 +1571,7 @@ dissector_try_heuristic(heur_dissector_list_t sub_dissectors, saved_proto = pinfo->current_proto; if (pinfo->layer_names != NULL) - saved_layer_names_len = pinfo->layer_names->len; + saved_layer_names_len = (gint) pinfo->layer_names->len; for (entry = sub_dissectors; entry != NULL; entry = g_slist_next(entry)) { /* XXX - why set this now and above? */ diff --git a/epan/prefs.c b/epan/prefs.c index e525a1ba98..f902422aa9 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -901,11 +901,11 @@ put_string_list(GList *sl) static gchar pref_str[MAX_FMT_PREF_LEN] = ""; GList *clp = g_list_first(sl); gchar *str; - int cur_pos = 0, cur_len = 0; + size_t cur_pos = 0, cur_len = 0; gchar *quoted_str; - int str_len; + size_t str_len; gchar *strp, *quoted_strp, c; - int fmt_len; + size_t fmt_len; while (clp) { str = clp->data; @@ -936,7 +936,7 @@ put_string_list(GList *sl) pref_str[cur_len] = '\n'; cur_len++; pref_str[cur_len] = '\t'; cur_len++; } - g_snprintf(&pref_str[cur_len], MAX_FMT_PREF_LEN - cur_len, "\"%s\", ", quoted_str); + g_snprintf(&pref_str[cur_len], MAX_FMT_PREF_LEN - (gulong) cur_len, "\"%s\", ", quoted_str); cur_pos += fmt_len; cur_len += fmt_len; } @@ -1757,7 +1757,7 @@ set_pref(gchar *pref_name, gchar *value, void *private_data _U_) pref_t *pref; gboolean had_a_dot; const gchar *cust_format = col_format_to_string(COL_CUSTOM); - int cust_format_len = strlen(cust_format); + size_t cust_format_len = strlen(cust_format); if (strcmp(pref_name, PRS_PRINT_FMT) == 0) { if (strcmp(value, pr_formats[PR_FMT_TEXT]) == 0) {