diff options
author | Guy Harris <guy@alum.mit.edu> | 2008-06-25 09:12:35 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2008-06-25 09:12:35 +0000 |
commit | 83fc9d5e0952b79aa59f2676f73c54893c0c7a56 (patch) | |
tree | 2f52b71c5dec33e0ee6a1b48d6420269ab845ee2 /epan/dissectors/packet-netflow.c | |
parent | 044e57c91780795ada89b9a5cd50cf0f53eadfc2 (diff) |
Constify a bunch of stuff, to squelch -Wwrite-strings warnings.
epan/dissectors/packet-ncp2222.inc is a bit hard to fix, so we're not
ready to enable that warning by default yet.
Throw in some casts to handle GLib routines that take arbitrary
non-const pointers (they can later return the pointers, and some
callers might want to modify or free up those pointers in cases where
they're known to be writable or allocated).
Use ep_tvb_memdup() rather than a combination of ep_alloc() and
tvb_memcpy().
Clean up some indentation.
svn path=/trunk/; revision=25601
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
-rw-r--r-- | epan/dissectors/packet-netflow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 632a29d49f..17703b0a3b 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -398,7 +398,7 @@ static struct v9_template *v9_template_get(guint16 id, address * net_src, guint32 src_id); static const char * decode_v9_template_types(int type); -static gchar *getprefix(const guint32 * address, int prefix); +static const gchar *getprefix(const guint32 * address, int prefix); static int flow_process_ints(proto_tree * pdutree, tvbuff_t * tvb, int offset); @@ -2214,7 +2214,7 @@ dissect_pdu(proto_tree * pdutree, tvbuff_t * tvb, int offset, hdrinfo_t * hdrinf return (offset - startoffset); } -static gchar * +static const gchar * getprefix(const guint32 * address, int prefix) { guint32 gprefix; |