diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-29 18:59:06 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-11-29 18:59:06 +0000 |
| commit | 5ac6474c945133a8415fb3be917859e5d42b6256 (patch) | |
| tree | ee20c73dfaf23171bd739a6a3d7558db0f451097 /epan/dissectors/packet-k12.c | |
| parent | 288efa5128341fab8907f3a2969a0bed95ae65cf (diff) | |
Rename some of pint.h macros to match common style (bits number on the end).
pntohs -> pntoh16
pntohl -> pntoh32
pletohs -> pletoh16
pletohl -> pletoh32
phtons -> phton16
phtonl -> phton32
svn path=/trunk/; revision=53652
Diffstat (limited to 'epan/dissectors/packet-k12.c')
| -rw-r--r-- | epan/dissectors/packet-k12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 7818e43fd4..6fe9f4f14b 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -90,7 +90,7 @@ fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint32 length) { guint adj = 0; /* 0x11=control frame 0x30=data frame */ - guint info_type = pntohs(extra_info); + guint info_type = pntoh16(extra_info); /* 1=FDD, 2=TDD 3.84, 3=TDD 1.28 */ guchar radio_mode = extra_info[14]; guchar channel_type = 0; @@ -103,7 +103,7 @@ fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint32 length) p_fp_info->division = (enum division_type)radio_mode; /* Format used by K15, later fields are shifted by 8 bytes. */ - if (pntohs(extra_info+2) == 5) + if (pntoh16(extra_info+2) == 5) adj = 8; p_fp_info->iface_type = IuB_Interface; @@ -172,10 +172,10 @@ fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint32 length) /* For each channel */ for (i = 0; i < (guint)p_fp_info->num_chans && (36+i*104+adj) <= length; ++i) { /* Read TB size */ - p_fp_info->chan_tf_size[i] = pntohl(extra_info+28+i*104+adj); + p_fp_info->chan_tf_size[i] = pntoh32(extra_info+28+i*104+adj); if (p_fp_info->chan_tf_size[i]) /* Work out number of TBs on this channel */ - p_fp_info->chan_num_tbs[i] = pntohl(extra_info+32+i*104+adj) + p_fp_info->chan_num_tbs[i] = pntoh32(extra_info+32+i*104+adj) / p_fp_info->chan_tf_size[i]; } } |