diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
| commit | 3eb06be97d520daef0bad19bf9c261b01abdc66d (patch) | |
| tree | 521ce26d4bc68c8e4158df7aa2af769ba60e93b9 /epan/dissectors/packet-pgm.c | |
| parent | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48425
Diffstat (limited to 'epan/dissectors/packet-pgm.c')
| -rw-r--r-- | epan/dissectors/packet-pgm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 46492af3b0..41d92d026f 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -257,7 +257,7 @@ optsstr(guint8 opts) if (opts == 0) return(""); - msg=ep_alloc(MAX_STR_LEN); + msg=(char *)ep_alloc(MAX_STR_LEN); if (opts & PGM_OPT){ returned_length = g_snprintf(&msg[idx], MAX_STR_LEN-idx, "Present"); idx += MIN(returned_length, MAX_STR_LEN-idx); @@ -289,7 +289,7 @@ paritystr(guint8 parity) if (parity == 0) return(""); - msg=ep_alloc(MAX_STR_LEN); + msg=(char *)ep_alloc(MAX_STR_LEN); if (parity & PGM_OPT_PARITY_PRM_PRO){ returned_length = g_snprintf(&msg[idx], MAX_STR_LEN-idx, "Pro-active"); idx += MIN(returned_length, MAX_STR_LEN-idx); @@ -506,7 +506,7 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) firsttime = TRUE; soffset = 0; naks = (int)(optdata_len/sizeof(guint32)); - nakbuf = ep_alloc(8192); + nakbuf = (unsigned char *)ep_alloc(8192); j = 0; /* * Print out 8 per line |