aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sdh.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2012-11-29 20:15:37 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2012-11-29 20:15:37 +0000
commit0266cceef3e00f56bcdf68282a3937a18cd956de (patch)
tree0bb294b06d441b252bc343133359c316a8ebd29c /epan/dissectors/packet-sdh.c
parentc33b0ad215b2f8be059b0a00319358547e5bac34 (diff)
Make all enum_val_t's const.
svn path=/trunk/; revision=46292
Diffstat (limited to 'epan/dissectors/packet-sdh.c')
-rw-r--r--epan/dissectors/packet-sdh.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c
index b37c24d2cf..8406392d68 100644
--- a/epan/dissectors/packet-sdh.c
+++ b/epan/dissectors/packet-sdh.c
@@ -68,7 +68,7 @@ static dissector_handle_t data_handle;
static gint sdh_data_rate = 1;
-static enum_val_t data_rates[] = {
+static const enum_val_t data_rates[] = {
{"Attempt to guess", "Attempt to guess", -1},
{"OC-3", "OC-3", 1},
{"OC-12", "OC-12", 4},
@@ -97,21 +97,21 @@ const value_string sdh_s1_vals[] = {
{ 0, NULL }
};
-static int
+static int
get_sdh_level(tvbuff_t *tvb, packet_info *pinfo)
{
/*data rate has been set in the SDH options*/
if(sdh_data_rate != -1) return sdh_data_rate;
/*ERF specifies data rate*/
- switch((pinfo->pseudo_header->erf.ehdr_list[0].ehdr & 0xff00) >> 8){
+ switch((pinfo->pseudo_header->erf.ehdr_list[0].ehdr & 0xff00) >> 8){
case 1: /*OC-3*/
return 1;
case 2: /*OC-12*/
return 4;
case 3: /*OC-48*/
- return 16;
+ return 16;
default: /*drop through and try the next method*/
- ;
+ ;
}
/*returns the multiplier for each data level*/
switch(tvb_reported_length(tvb)){
@@ -122,7 +122,7 @@ get_sdh_level(tvbuff_t *tvb, packet_info *pinfo)
case 19440: /*OC-24*/
return 8;
case 38880: /*OC-48*/
- return 16;
+ return 16;
}
return 1;