diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 21:29:45 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 21:29:45 +0000 |
| commit | 3105ee542f89cd986d0f81d2cd70ce385021d1ce (patch) | |
| tree | 8ffc7d7c256c3f3e72a0be7cc31aa2a69cdaed81 /epan/strutil.c | |
| parent | 9630bf353e2ca03bdce5d7ce00f184c898ba40cd (diff) | |
Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the epan/ directory but leave winsock2.h in inet_pton.c
and inet_ntop.c for now (can't estimate the consequences).
svn path=/trunk/; revision=5928
Diffstat (limited to 'epan/strutil.c')
| -rw-r--r-- | epan/strutil.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/strutil.c b/epan/strutil.c index 9886240ff4..b5fe3d6bcd 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -1,7 +1,7 @@ /* strutil.c * String utility routines * - * $Id: strutil.c,v 1.7 2000/12/22 12:05:36 gram Exp $ + * $Id: strutil.c,v 1.8 2002/08/02 21:29:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -40,10 +40,10 @@ * buffer. * Return a pointer to the EOL character(s) in "*eol". */ -const u_char * -find_line_end(const u_char *data, const u_char *dataend, const u_char **eol) +const guchar * +find_line_end(const guchar *data, const guchar *dataend, const guchar **eol) { - const u_char *lineend; + const guchar *lineend; lineend = memchr(data, '\n', dataend - data); if (lineend == NULL) { @@ -105,10 +105,10 @@ find_line_end(const u_char *data, const u_char *dataend, const u_char **eol) * Return 0 if there is no next token. */ int -get_token_len(const u_char *linep, const u_char *lineend, - const u_char **next_token) +get_token_len(const guchar *linep, const guchar *lineend, + const guchar **next_token) { - const u_char *tokenp; + const guchar *tokenp; int token_len; tokenp = linep; @@ -139,13 +139,13 @@ get_token_len(const u_char *linep, const u_char *lineend, * characters as C-style escapes, and return a pointer to it. */ gchar * -format_text(const u_char *string, int len) +format_text(const guchar *string, int len) { static gchar *fmtbuf; static int fmtbuf_len; int column; - const u_char *stringend = string + len; - u_char c; + const guchar *stringend = string + len; + guchar c; int i; /* |