diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-04-09 19:43:19 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-04-09 19:43:19 +0000 |
commit | ac5c40e6c54ae28f32c7d468c90e3e18e7e4b342 (patch) | |
tree | d0b8c47e3adad8e904788bcacf936a887b07f45d | |
parent | 9d33f00098e6d5ed6087dd7ca7451e5182845d63 (diff) |
Mark some function static.
svn path=/trunk/; revision=41999
-rw-r--r-- | epan/conversation.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-babel.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-brp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-cip.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-cipsafety.c | 58 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-windows-common.c | 2 | ||||
-rw-r--r-- | wiretap/netscaler.c | 2 |
8 files changed, 37 insertions, 37 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 63579f6a4d..125ed1f724 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -411,7 +411,7 @@ conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w) /* * Free the proto_data. The conversation itself is se_allocated. */ -void +static void free_data_list(gpointer key _U_, gpointer value, gpointer user_data _U_) { conversation_t *conv = value; diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index 856c78d631..f937969ec9 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -115,7 +115,7 @@ format_address(const unsigned char *prefix) return ip6_to_str((const struct e_in6_addr*)prefix); } -const char * +static const char * format_prefix(const unsigned char *prefix, unsigned char plen) { return ep_strdup_printf("%s/%u", format_address(prefix), plen); diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c index 9f4ceee3f1..9117766033 100644 --- a/epan/dissectors/packet-brp.c +++ b/epan/dissectors/packet-brp.c @@ -130,7 +130,7 @@ static gint ett_brp_fltype = -1; /* Preferences */ static guint global_brp_port = 0; -int +static int dissect_brp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index e8e54bdf57..f1abeb56f4 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -2299,7 +2299,7 @@ static const value_string cip_class_names_vals[] = { value_string_ext cip_class_names_vals_ext = VALUE_STRING_EXT_INIT(cip_class_names_vals); -int dissect_id_revision(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +static int dissect_id_revision(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { if (total_len < 2) @@ -2313,7 +2313,7 @@ int dissect_id_revision(packet_info *pinfo, proto_tree *tree, proto_item *item, return 2; } -int dissect_msg_rout_num_classes(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, +static int dissect_msg_rout_num_classes(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { guint16 i, num_classes; diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index 7348d4ef57..43f0cff099 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -721,7 +721,7 @@ dissect_cip_class_s_supervisor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr return tvb_length(tvb); } -int dissect_s_supervisor_exception_detail(proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int hf_size, int hf_data) +static int dissect_s_supervisor_exception_detail(proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int hf_size, int hf_data) { int size; @@ -733,7 +733,7 @@ int dissect_s_supervisor_exception_detail(proto_tree *tree, proto_item *item, tv return size+1; } -int dissect_s_supervisor_exception_detail_alarm(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +static int dissect_s_supervisor_exception_detail_alarm(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { proto_item *pi; @@ -782,8 +782,8 @@ int dissect_s_supervisor_exception_detail_alarm(packet_info *pinfo, proto_tree * return total_size; } -int dissect_s_supervisor_exception_detail_warning(packet_info *pinfo, proto_tree *tree, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_supervisor_exception_detail_warning(packet_info *pinfo, proto_tree *tree, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { proto_item *pi; proto_tree *item_tree; @@ -831,8 +831,8 @@ int dissect_s_supervisor_exception_detail_warning(packet_info *pinfo, proto_tree return total_size; } -int dissect_s_supervisor_configuration_unid(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_supervisor_configuration_unid(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { if (total_len < 10) { @@ -851,8 +851,8 @@ int dissect_s_supervisor_configuration_unid(packet_info *pinfo, proto_tree *tree return 10; } -int dissect_s_supervisor_safety_configuration_id(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_supervisor_safety_configuration_id(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { if (total_len < 10) { @@ -871,8 +871,8 @@ int dissect_s_supervisor_safety_configuration_id(packet_info *pinfo, proto_tree return 10; } -int dissect_s_supervisor_target_unid(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_supervisor_target_unid(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { if (total_len < 10) { @@ -891,8 +891,8 @@ int dissect_s_supervisor_target_unid(packet_info *pinfo, proto_tree *tree _U_, p return 10; } -int dissect_s_supervisor_output_connection_point_owners(packet_info *pinfo, proto_tree *tree, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_supervisor_output_connection_point_owners(packet_info *pinfo, proto_tree *tree, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { guint16 i, num_entries; proto_item *entry_item, *app_path_item; @@ -954,8 +954,8 @@ int dissect_s_supervisor_output_connection_point_owners(packet_info *pinfo, prot return attr_len; } -int dissect_s_supervisor_proposed_tunid(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_supervisor_proposed_tunid(packet_info *pinfo, proto_tree *tree _U_, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { if (total_len < 10) { @@ -979,8 +979,8 @@ int dissect_s_supervisor_proposed_tunid(packet_info *pinfo, proto_tree *tree _U_ * Dissector for CIP Safety Validator Object * ************************************************/ -int dissect_s_validator_type(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, - int offset, int total_len) +static int dissect_s_validator_type(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, + int offset, int total_len) { proto_item *pi; proto_tree *item_tree; @@ -999,8 +999,8 @@ int dissect_s_validator_type(packet_info *pinfo, proto_tree *tree, proto_item *i return 1; } -int dissect_s_validator_time_coord_msg_min_mult(packet_info *pinfo, proto_tree *tree, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_validator_time_coord_msg_min_mult(packet_info *pinfo, proto_tree *tree, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { int i, size; @@ -1024,8 +1024,8 @@ int dissect_s_validator_time_coord_msg_min_mult(packet_info *pinfo, proto_tree * return (size+1); } -int dissect_s_validator_network_time_multiplier(packet_info *pinfo, proto_tree *tree, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_validator_network_time_multiplier(packet_info *pinfo, proto_tree *tree, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { int i, size; @@ -1049,7 +1049,7 @@ int dissect_s_validator_network_time_multiplier(packet_info *pinfo, proto_tree * return (size+1); } -int dissect_s_validator_timeout_multiplier(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +static int dissect_s_validator_timeout_multiplier(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { int i, size; @@ -1074,8 +1074,8 @@ int dissect_s_validator_timeout_multiplier(packet_info *pinfo, proto_tree *tree, return (size+1); } -int dissect_s_validator_coordination_conn_inst(packet_info *pinfo, proto_tree *tree, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_validator_coordination_conn_inst(packet_info *pinfo, proto_tree *tree, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { int i, size; @@ -1099,15 +1099,15 @@ int dissect_s_validator_coordination_conn_inst(packet_info *pinfo, proto_tree *t return (size+1); } -int dissect_s_validator_app_data_path(packet_info *pinfo, proto_tree *tree _U_, - proto_item *item, tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_validator_app_data_path(packet_info *pinfo, proto_tree *tree _U_, + proto_item *item, tvbuff_t *tvb, int offset, int total_len) { dissect_epath(tvb, pinfo, item, offset, total_len, FALSE, FALSE, NULL, NULL); return total_len; } -int dissect_s_validator_prod_cons_fault_count(packet_info *pinfo, proto_tree *tree, proto_item *item, - tvbuff_t *tvb, int offset, int total_len) +static int dissect_s_validator_prod_cons_fault_count(packet_info *pinfo, proto_tree *tree, proto_item *item, + tvbuff_t *tvb, int offset, int total_len) { int i, size; @@ -1626,7 +1626,7 @@ dissect_cipsafety(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -int dissect_sercosiii_link_error_count_p1p2(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +static int dissect_sercosiii_link_error_count_p1p2(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { if (total_len < 4) @@ -1640,7 +1640,7 @@ int dissect_sercosiii_link_error_count_p1p2(packet_info *pinfo, proto_tree *tree return 4; } -int dissect_tcpip_ssn(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +static int dissect_tcpip_ssn(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { if (total_len < 6) diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 207bd633d6..0715e28934 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1312,7 +1312,7 @@ process_ssl_payload(tvbuff_t *tvb, volatile int offset, packet_info *pinfo, } } -void +static void dissect_ssl_payload(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree, SslAssociation* association) { gboolean save_fragmented; diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 71986e821c..be75070d37 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1439,7 +1439,7 @@ static const sid_strings well_known_sids[] = { {NULL, NULL} }; -const char* +static const char* match_wkwn_sids(const char* sid) { int i = 0; while (well_known_sids[i].name) { diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index ead6ea33eb..4c9a39e2e0 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -586,7 +586,7 @@ int nstrace_open(wtap *wth, int *err, gchar **err_info) #define nspm_signature_func(ver) \ - guint32 nspm_signature_isv##ver(gchar *sigp) {\ + static guint32 nspm_signature_isv##ver(gchar *sigp) {\ return strncmp(sigp,NSPR_SIGSTR_V##ver,(sizeof(NSPR_SIGSTR_V##ver)-1));\ } |