diff options
author | Gerald Combs <gerald@wireshark.org> | 2009-04-08 05:25:14 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2009-04-08 05:25:14 +0000 |
commit | 844af38e5412af04e9a695331a9fcbbd9f86e406 (patch) | |
tree | 88635f81867c46b0775a9385c904ba37ff5496b2 /epan/osi-utils.c | |
parent | d9f7a40296b380babe03dc54deb2fbfc9262994b (diff) | |
download | wireshark-844af38e5412af04e9a695331a9fcbbd9f86e406.tar.gz |
size_t fixes.
svn path=/trunk/; revision=27990
Diffstat (limited to 'epan/osi-utils.c')
-rw-r--r-- | epan/osi-utils.c | 45 |
1 files changed, 23 insertions, 22 deletions
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++] ); } } } |