diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-12-26 05:57:06 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-12-26 05:57:06 +0000 |
| commit | 8ed7a73e22c049a2e013bb436e599bff41fc5b9b (patch) | |
| tree | ad4a4cc6fb4ff4d3e3ffe3a3f8e3d056e441ae46 /epan/dissectors/packet-giop.h | |
| parent | 8ede6b7dc09aa636f87147ab432a137c209e8aca (diff) | |
Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().
Change some data types to avoid those implicit conversion warnings.
When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.
Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers. Cast
away those warnings in some cases where an API we don't control forces
us to do so.
Enable a bunch of additional warnings by default. Note why at least
some of the other warnings aren't enabled.
randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.
If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.
svn path=/trunk/; revision=46748
Diffstat (limited to 'epan/dissectors/packet-giop.h')
| -rw-r--r-- | epan/dissectors/packet-giop.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-giop.h b/epan/dissectors/packet-giop.h index 7807ea1eef..1e71d71648 100644 --- a/epan/dissectors/packet-giop.h +++ b/epan/dissectors/packet-giop.h @@ -98,7 +98,7 @@ typedef enum ReplyStatusType { */ typedef gboolean (giop_sub_dissector_t)(tvbuff_t *, packet_info *, proto_tree *, int *, - MessageHeader *, gchar * , gchar *); + MessageHeader *, const gchar * , gchar *); /* * Generic Subdissector handle, wraps user info. @@ -359,7 +359,7 @@ extern guint8 get_CDR_octet(tvbuff_t *tvb, int *offset); * This function also increments offset by len. */ -extern void get_CDR_octet_seq(tvbuff_t *tvb, gchar **seq, int *offset, guint32 len); +extern void get_CDR_octet_seq(tvbuff_t *tvb, const gchar **seq, int *offset, guint32 len); /* Copy a 2 octet sequence from the tvbuff * which represents a signed short value, and convert @@ -396,7 +396,7 @@ extern void giop_add_CDR_string(proto_tree *tree, tvbuff_t *tvb, int *offset, * */ -extern guint32 get_CDR_string(tvbuff_t *tvb, gchar **seq, int *offset, +extern guint32 get_CDR_string(tvbuff_t *tvb, const gchar **seq, int *offset, gboolean stream_is_big_endian, int boundary); @@ -482,7 +482,7 @@ extern guint16 get_CDR_ushort(tvbuff_t *tvb, int *offset, * Wchar is not supported for GIOP 1.0. */ -extern gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, +extern gint get_CDR_wchar(tvbuff_t *tvb, const gchar **seq, int *offset, MessageHeader * header); @@ -505,7 +505,7 @@ extern gint get_CDR_wchar(tvbuff_t *tvb, gchar **seq, int *offset, * Wstring is not supported for GIOP 1.0. */ -extern guint32 get_CDR_wstring(tvbuff_t *tvb, gchar **seq, int *offset, +extern guint32 get_CDR_wstring(tvbuff_t *tvb, const gchar **seq, int *offset, gboolean stream_is_big_endian, int boundary, MessageHeader * header); @@ -540,7 +540,7 @@ extern guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint *offset, * the initial sequence. */ -extern gchar * make_printable_string (gchar *in, guint32 len); +extern gchar * make_printable_string (const gchar *in, guint32 len); /* * Enums for TCkind |