diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-04-16 08:37:39 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-04-16 08:37:39 +0000 |
| commit | 3f68c1395b5a4982ceb3839b0297038e4b15c0ab (patch) | |
| tree | d49ce9d688f8ab4a3a9395a3a7ad6a562818cfab /epan/dissectors | |
| parent | 111d18c4b37104b47afd3822ba0f27a3efc1d338 (diff) | |
Fix a couple warnings
svn path=/trunk/; revision=21446
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-isup.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-sccp.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 92737264e0..15823a2c19 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -6763,10 +6763,10 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_type = tvb_get_guint8(tvb, CIC_OFFSET + CIC_LENGTH); /* dissect CIC in main dissector since pass-along message type carrying complete IUSP message w/o CIC needs recursive message dissector call */ - if (mtp3_standard == ITU_STANDARD) - cic = tvb_get_letohs(tvb, CIC_OFFSET) & 0x0FFF; /*since upper 4 bits spare */ - else if (mtp3_standard == ANSI_STANDARD) + if (mtp3_standard == ANSI_STANDARD) cic = tvb_get_letohs(tvb, CIC_OFFSET) & 0x3FFF; /*since upper 2 bits spare */ + else /* ITU, China, and Japan; yes, J7's CICs are a different size */ + cic = tvb_get_letohs(tvb, CIC_OFFSET) & 0x0FFF; /*since upper 4 bits spare */ pinfo->ctype = CT_ISUP; pinfo->circuit_id = cic; diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 3737fdf2e4..a4e2efd17e 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -2622,7 +2622,7 @@ static void sccp_users_update_cb(void* r, char** err _U_) { u->handlep = &data_handle; } -static void* sccp_users_copy_cb(void* n, const void* o, unsigned siz) { +static void* sccp_users_copy_cb(void* n, const void* o, unsigned siz _U_) { const sccp_user_t* u = o; sccp_user_t* un = n; @@ -2631,7 +2631,7 @@ static void* sccp_users_copy_cb(void* n, const void* o, unsigned siz) { un->uses_tcap = u->uses_tcap; un->handlep = u->handlep; if (u->called_pc) un->called_pc = range_copy(u->called_pc); - if (u->called_ssn) un->called_ssn= range_copy(u->called_ssn); + if (u->called_ssn) un->called_ssn = range_copy(u->called_ssn); return n; } @@ -3117,14 +3117,14 @@ proto_register_sccp(void) prefs_register_bool_preference(sccp_module, "show_more_info", - "Show key parameters in Info Column", - "Show SLR, DLR, and CAUSE Parameters in the Information Column of the Summary", - &show_key_params); + "Show key parameters in Info Column", + "Show SLR, DLR, and CAUSE Parameters in the Information Column of the Summary", + &show_key_params); prefs_register_uat_preference(sccp_module, "users_table", "Users Table", - "A table that enumerates user protocols to be used against specific PCs and SSNs", - users_uat); + "A table that enumerates user protocols to be used against specific PCs and SSNs", + users_uat); register_init_routine(&init_sccp); |