diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-04-02 10:41:19 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-04-02 10:41:19 +0000 |
commit | 393b1b3e8dd9bedea24a039f97e15ef37310303f (patch) | |
tree | c4c60253cfedb297054832dd817ccfcf9863469d /epan/osi-utils.c | |
parent | 9b99fdd7abb90332607782b63dca0a897678c5e3 (diff) | |
download | wireshark-393b1b3e8dd9bedea24a039f97e15ef37310303f.tar.gz |
Don't use "u_int" and "u_char", as they're not defined in <sys/types.h>
on Windows, so we'd have to drag in <winsock.h> to define them.
svn path=/trunk/; revision=3246
Diffstat (limited to 'epan/osi-utils.c')
-rw-r--r-- | epan/osi-utils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/osi-utils.c b/epan/osi-utils.c index 95a7589d78..887265df7d 100644 --- a/epan/osi-utils.c +++ b/epan/osi-utils.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: osi-utils.c,v 1.1 2001/04/01 05:48:15 hagbard Exp $ + * $Id: osi-utils.c,v 1.2 2001/04/02 10:41:19 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -44,7 +44,7 @@ #include "osi-utils.h" -gchar *print_nsap_net( const u_char *buffer, int length) +gchar *print_nsap_net( const guint8 *buffer, int length) { /* to do : NSAP / NET decoding */ @@ -74,9 +74,9 @@ gchar *print_nsap_net( const u_char *buffer, int length) } /* print_nsap */ -gchar *print_system_id( const u_char *buffer, int length ) { +gchar *print_system_id( const guint8 *buffer, int length ) { int tmp; - u_char *cur; + gchar *cur; static gchar str[MAX_SYSTEMID_LEN * 3 + 5]; /* Don't trust exact matching */ if ( ( length <= 0 ) || ( length > MAX_SYSTEMID_LEN ) ) { @@ -110,7 +110,7 @@ gchar *print_system_id( const u_char *buffer, int length ) { return( str ); } -gchar *print_area(const u_char *buffer, int length) +gchar *print_area(const guint8 *buffer, int length) { /* to do : all real area decoding now: NET is assumed if id len is 1 more byte * and take away all these stupid resource consuming local statics @@ -118,7 +118,7 @@ gchar *print_area(const u_char *buffer, int length) static gchar str[MAX_AREA_LEN * 3 + 20]; /* reserve space for nice layout */ gchar *cur; - u_int tmp = 0; + int tmp = 0; cur = str; |