diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-07-17 13:53:26 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-07-17 13:53:26 +0000 |
| commit | 485110f2417a4110b14c09201d9333f0c218ece5 (patch) | |
| tree | ffd3a8b1d62981d12a8079960af431b5d13a7f63 /epan/dissectors/packet-bacapp.h | |
| parent | 6be48cf5dd5e95fe4a99adf0922875a6ff96d67d (diff) | |
| download | wireshark-485110f2417a4110b14c09201d9333f0c218ece5.tar.gz | |
We require GLIB-2 now so there's no need to attempt to use regular iconv: use
the GLIB version instead.
Reindent some (does someone have their tabstops set to 4?).
Create and use some #defines instead of hard-coded values. For example,
replace 0x00 with ANSI_X34 in both the value_string and the case statement.
(This file could use a lot more of such changes.)
packet-bacapp.c appears to compile cleanly now so move it to
CLEAN_DISSECTOR_SOURCE.
svn path=/trunk/; revision=25758
Diffstat (limited to 'epan/dissectors/packet-bacapp.h')
| -rw-r--r-- | epan/dissectors/packet-bacapp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h index 1e8b1f8260..4b1d19734b 100644 --- a/epan/dissectors/packet-bacapp.h +++ b/epan/dissectors/packet-bacapp.h @@ -30,9 +30,6 @@ #ifdef HAVE_CONFIG_H # include "config.h" -#if HAVE_ICONV -#include <iconv.h> -#endif #endif #include <stdio.h> @@ -2074,7 +2071,7 @@ void proto_reg_handoff_bacapp(void); /** - * converts XXX coded strings to UTF-8 if iconv is allowed + * converts XXX coded strings to UTF-8 * else 'in' is copied to 'out' * @param in -- pointer to string * @param inbytesleft @@ -2084,7 +2081,7 @@ proto_reg_handoff_bacapp(void); * @return count of modified characters of returned string, -1 for errors */ guint32 -fConvertXXXtoUTF8(const guint8 *in, size_t *inbytesleft,guint8 *out, size_t *outbytesleft, const gchar *fromcoding); +fConvertXXXtoUTF8(gchar *in, size_t *inbytesleft, gchar *out, size_t *outbytesleft, const gchar *fromcoding); #endif /* __BACAPP_H__ */ |