diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
| commit | ae747e4c4b34c2d6889df335a439b9fba77538d0 (patch) | |
| tree | 3586ed7bc3e608af6db8bf6eff87fb3990c45b35 /epan/dissectors/packet-tds.c | |
| parent | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48430
Diffstat (limited to 'epan/dissectors/packet-tds.c')
| -rw-r--r-- | epan/dissectors/packet-tds.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index a56e9903b3..72c584be47 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1182,7 +1182,7 @@ dissect_tds7_login(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len *= 2; val = (gchar*)tvb_get_ephemeral_string(tvb, offset2, len); - val2 = ep_alloc((len/2)+1); + val2 = (char *)ep_alloc((len/2)+1); for(j = 0, k = 0; j < len; j += 2, k++) { val[j] ^= 0xA5; @@ -1310,7 +1310,7 @@ dissect_tds_col_info_token(tvbuff_t *tvb, struct _netlib_data *nl_data, guint of return FALSE; } - nl_data->columns[col] = ep_alloc(sizeof(struct _tds_col)); + nl_data->columns[col] = ep_new(struct _tds_col); nl_data->columns[col]->name[0] ='\0'; @@ -1368,7 +1368,7 @@ read_results_tds5(tvbuff_t *tvb, struct _netlib_data *nl_data, guint offset, gui cur += 2; for (i = 0; i < nl_data->num_cols; i++) { - nl_data->columns[i] = ep_alloc(sizeof(struct _tds_col)); + nl_data->columns[i] = ep_new(struct _tds_col); name_len = tvb_get_guint8(tvb,cur); cur ++; cur += name_len; |