diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-08 17:50:56 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-09 00:51:21 +0000 |
| commit | ed075f20226d06c0a41727c1a2b4de0e3d8807e6 (patch) | |
| tree | d1e461794dab40a13480f605777c0876d8688120 /epan | |
| parent | 6ae5747c098db1cbeeb890da5b5386ecaed6d55b (diff) | |
Fix some C++ warnings about implicit casts.
Change-Id: I19730e723700f0cc7dcc7ba0db2689f076c7bb5b
Reviewed-on: https://code.wireshark.org/review/1034
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-mapi.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/pidl/mapi/request.cnf.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/pidl/mapi/response.cnf.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 98f85785e6..40212165f3 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -4057,7 +4057,7 @@ mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_ size = reported_len; } ptr = tvb_get_ptr(tvb, offset, size); - decrypted_data = g_malloc(size); + decrypted_data = (guint8 *)g_malloc(size); for (i = 0; i < size; i++) { decrypted_data[i] = ptr[i] ^ 0xA5; } @@ -4300,7 +4300,7 @@ mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet size = reported_len; } ptr = tvb_get_ptr(tvb, offset, size); - decrypted_data = g_malloc(size); + decrypted_data = (guint8 *)g_malloc(size); for (i = 0; i < size; i++) { decrypted_data[i] = ptr[i] ^ 0xA5; } diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c index 9afd25650a..08c724a014 100644 --- a/epan/dissectors/pidl/mapi/request.cnf.c +++ b/epan/dissectors/pidl/mapi/request.cnf.c @@ -129,7 +129,7 @@ mapi_dissect_element_EcDoRpc_request_(tvbuff_t *tvb _U_, int offset _U_, packet_ ptr = tvb_get_ptr(tvb, offset, size); - decrypted_data = g_malloc(size); + decrypted_data = (guint8 *)g_malloc(size); for (i = 0; i < size; i++) { decrypted_data[i] = ptr[i] ^ 0xA5; } diff --git a/epan/dissectors/pidl/mapi/response.cnf.c b/epan/dissectors/pidl/mapi/response.cnf.c index dad8afb44e..97e986c51b 100644 --- a/epan/dissectors/pidl/mapi/response.cnf.c +++ b/epan/dissectors/pidl/mapi/response.cnf.c @@ -139,7 +139,7 @@ mapi_dissect_element_EcDoRpc_response_(tvbuff_t *tvb _U_, int offset _U_, packet ptr = tvb_get_ptr(tvb, offset, size); - decrypted_data = g_malloc(size); + decrypted_data = (guint8 *)g_malloc(size); for (i = 0; i < size; i++) { decrypted_data[i] = ptr[i] ^ 0xA5; } |