diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-08-17 00:52:03 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-08-17 00:52:03 +0000 |
| commit | e956aac299bdc5dc6860a831d73522ebe6f22f85 (patch) | |
| tree | 8faacff59f51b0a5c1c60bf8e617c37ff4d9abc8 /packet-ldap.c | |
| parent | bf258889fb959c5a21c11d636541f902b19d8301 (diff) | |
Sigh. I think I once tried making the last argument to "col_set_str()"
be a "const gchar *", and it ended up being like pulling a thread out of
a sweater - more things had to change, which meant still more things had
to change, and I might've even run into something that didn't change
very well at all. (Or perhaps that was constifying something else.)
For now, we just cast away the constness in calls to "col_set_str()";
the column code won't actually overwrite the string.
svn path=/trunk/; revision=8174
Diffstat (limited to 'packet-ldap.c')
| -rw-r--r-- | packet-ldap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ldap.c b/packet-ldap.c index 0caaabd0e2..48d26488a1 100644 --- a/packet-ldap.c +++ b/packet-ldap.c @@ -3,7 +3,7 @@ * * See RFC 1777 (LDAP v2), RFC 2251 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap.c,v 1.63 2003/08/12 20:14:05 tpot Exp $ + * $Id: packet-ldap.c,v 1.64 2003/08/17 00:52:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1858,7 +1858,7 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (first_time) { if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, pinfo->current_proto); + col_set_str(pinfo->cinfo, COL_PROTOCOL, (gchar *)pinfo->current_proto); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); } @@ -1994,7 +1994,7 @@ dissect_ldap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (first_time) { if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, pinfo->current_proto); + col_set_str(pinfo->cinfo, COL_PROTOCOL, (gchar *)pinfo->current_proto); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); } |