diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-23 10:59:26 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-23 10:59:26 +0000 |
| commit | 1cb2713ca4f49017083a4854068a7bd5027d37cc (patch) | |
| tree | f690697725617a640820ade652da4cf766bdc863 /epan/dissectors/packet-enip.c | |
| parent | edb41d122c7688f977051b18a144a7cc6ffd1b93 (diff) | |
Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.
If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.
Constify a bunch of stuff, and make some other changes, to get rid of
warnings.
Clean up some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21526 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-enip.c')
| -rw-r--r-- | epan/dissectors/packet-enip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index d7112f3312..59daefc5c6 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -226,7 +226,7 @@ add_byte_array_text_to_proto_tree( proto_tree *tree, tvbuff_t *tvb, gint start, tmp2_length = ( length * 2 ) + 1; } - tmp = (char *)tvb_get_ptr( tvb, start, tmp_length ); + tmp = (const char *)tvb_get_ptr( tvb, start, tmp_length ); tmp2 = (char *)ep_alloc( tmp2_length ); tmp2start = tmp2; @@ -549,7 +549,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int packet_type; guint16 encap_cmd, encap_data_length; - char *pkt_type_str = ""; + const char *pkt_type_str = ""; guint32 ifacehndl; /* Set up structures needed to add the protocol subtree and manage it */ |