forked from osmocom/wireshark
doxygen: Try to fix warnings.
Change-Id: I1517c968f05e7d9c6b561c0f5a7c6a059462d175 Reviewed-on: https://code.wireshark.org/review/33889 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman
Anders Broman
parent
b88f840409
commit
850713cc8d
|
|
@ -128,13 +128,13 @@ WS_DLL_PUBLIC void decode_clear_all(void);
|
|||
*
|
||||
* @param table_name The table name in which this dissector is found.
|
||||
*
|
||||
* @param selector_type The type of the selector in that dissector table
|
||||
*
|
||||
* @param key A pointer to the key for this entry in the dissector
|
||||
* hash table. This is generally the numeric selector of the
|
||||
* protocol, i.e. the ethernet type code, IP port number, TCP port
|
||||
* number, etc.
|
||||
*
|
||||
* @param selector_type The type of the selector in that dissector table
|
||||
*
|
||||
* @param value A pointer to the value for this entry in the dissector
|
||||
* hash table. This is an opaque pointer that can only be handed back
|
||||
* to routine in the file packet.c - but it's unused.
|
||||
|
|
@ -142,8 +142,8 @@ WS_DLL_PUBLIC void decode_clear_all(void);
|
|||
* @param user_data Unused.
|
||||
*/
|
||||
WS_DLL_PUBLIC void decode_build_reset_list (const gchar *table_name, ftenum_t selector_type,
|
||||
gpointer key, gpointer value _U_,
|
||||
gpointer user_data _U_);
|
||||
gpointer key, gpointer value,
|
||||
gpointer user_data);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -675,7 +675,7 @@ static const value_string eigrp_metric_comm_type_vals[] = {
|
|||
|
||||
|
||||
/**
|
||||
*@fn void dissect_eigrp_parameter (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
|
||||
*@fn void dissect_eigrp_parameter (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_item *ti)
|
||||
*
|
||||
*
|
||||
* @param[in,out] tree detail dissection result
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ static const value_string h248_3GCSD_properties_vals[] = {
|
|||
{0, NULL}
|
||||
};
|
||||
|
||||
static const value_string h248_3GCSD_signals_vals[] _U_ = {
|
||||
static const value_string h248_3GCSD_signals_vals[] = {
|
||||
{ 0x0001, "actprot" },
|
||||
{0, NULL}
|
||||
};
|
||||
|
|
@ -179,7 +179,7 @@ static const value_string h248_3GCSD_signal_actprot_vals[] = {
|
|||
{0, NULL}
|
||||
};
|
||||
|
||||
static const value_string h248_3GCSD_events_vals[] _U_ = {
|
||||
static const value_string h248_3GCSD_events_vals[] = {
|
||||
{ 0x0001, "protres"},
|
||||
{ 0x0002, "ratechg"},
|
||||
{0, NULL}
|
||||
|
|
|
|||
|
|
@ -825,7 +825,7 @@ static void dissect_fid (tvbuff_t*, packet_info*, proto_tree*, proto_tree*);
|
|||
static void dissect_nlp (tvbuff_t*, packet_info*, proto_tree*, proto_tree*);
|
||||
static void dissect_gds (tvbuff_t*, packet_info*, proto_tree*, proto_tree*);
|
||||
static void dissect_rh (tvbuff_t*, int, proto_tree*);
|
||||
static void dissect_control(tvbuff_t*, int, int, proto_tree*, int, enum parse);
|
||||
static void dissect_sna_control(tvbuff_t*, int, int, proto_tree*, int, enum parse);
|
||||
|
||||
static int sna_fid_to_str_buf(const address *addr, gchar *buf, int buf_len _U_)
|
||||
{
|
||||
|
|
@ -904,7 +904,7 @@ dissect_optional_0d(tvbuff_t *tvb, proto_tree *tree)
|
|||
while (tvb_offset_exists(tvb, offset)) {
|
||||
len = tvb_get_guint8(tvb, offset+0);
|
||||
if (len) {
|
||||
dissect_control(tvb, offset, len, tree, 1, LT);
|
||||
dissect_sna_control(tvb, offset, len, tree, 1, LT);
|
||||
pad = (len+3) & 0xfffc;
|
||||
if (pad > len)
|
||||
proto_tree_add_item(tree, hf_sna_padding, tvb, offset+len, pad-len, ENC_NA);
|
||||
|
|
@ -1026,7 +1026,7 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_tree_add_item(sub_tree, hf_sna_nlp_opti_14_si_alive,
|
||||
tvb, offset+12, 4, ENC_BIG_ENDIAN);
|
||||
|
||||
dissect_control(tvb, offset+16, len-16, sub_tree, 1, LT);
|
||||
dissect_sna_control(tvb, offset+16, len-16, sub_tree, 1, LT);
|
||||
|
||||
pad = (len+3) & 0xfffc;
|
||||
if (pad > len)
|
||||
|
|
@ -1062,7 +1062,7 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
while (num) {
|
||||
sublen = tvb_get_guint8(tvb, offset);
|
||||
if (sublen) {
|
||||
dissect_control(tvb, offset, sublen, sub_tree, 1, LT);
|
||||
dissect_sna_control(tvb, offset, sublen, sub_tree, 1, LT);
|
||||
} else {
|
||||
/* Invalid */
|
||||
call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, tree);
|
||||
|
|
@ -1332,7 +1332,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
if (((thdr_9 & 0x18) == 0x08) && ((thdr_len << 2) > subindx)) {
|
||||
counter = tvb_get_guint8(tvb, indx + subindx);
|
||||
if (tvb_get_guint8(tvb, indx+subindx+1) == 5)
|
||||
dissect_control(tvb, indx + subindx, counter+2, nlp_tree, 1, LT);
|
||||
dissect_sna_control(tvb, indx + subindx, counter+2, nlp_tree, 1, LT);
|
||||
else
|
||||
call_data_dissector(tvb_new_subset_length_caplen(tvb, indx + subindx, counter+2,
|
||||
-1), pinfo, nlp_tree);
|
||||
|
|
@ -1399,7 +1399,7 @@ dissect_xid2(tvbuff_t *tvb, proto_tree *tree)
|
|||
|
||||
while (tvb_offset_exists(tvb, offset)) {
|
||||
dlen = tvb_get_guint8(tvb, offset+1);
|
||||
dissect_control(tvb, offset, dlen+2, tree, 0, KL);
|
||||
dissect_sna_control(tvb, offset, dlen+2, tree, 0, KL);
|
||||
offset += (dlen + 2);
|
||||
}
|
||||
}
|
||||
|
|
@ -1487,7 +1487,7 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree)
|
|||
|
||||
while (tvb_offset_exists(tvb, offset)) {
|
||||
dlen = tvb_get_guint8(tvb, offset+1);
|
||||
dissect_control(tvb, offset, dlen+2, tree, 0, KL);
|
||||
dissect_sna_control(tvb, offset, dlen+2, tree, 0, KL);
|
||||
offset += (dlen+2);
|
||||
}
|
||||
}
|
||||
|
|
@ -2258,7 +2258,7 @@ dissect_control_05hpr(tvbuff_t *tvb, proto_tree *tree, int hpr,
|
|||
len = tvb_get_guint8(tvb, offset+1);
|
||||
}
|
||||
if (len) {
|
||||
dissect_control(tvb, offset, len, tree, hpr, parse);
|
||||
dissect_sna_control(tvb, offset, len, tree, hpr, parse);
|
||||
pad = (len+3) & 0xfffc;
|
||||
if (pad > len) {
|
||||
proto_tree_add_item(tree, hf_sna_padding, tvb, offset+len, pad-len, ENC_NA);
|
||||
|
|
@ -2297,7 +2297,7 @@ dissect_control_0e(tvbuff_t *tvb, proto_tree *tree)
|
|||
}
|
||||
|
||||
static void
|
||||
dissect_control(tvbuff_t *parent_tvb, int offset, int control_len,
|
||||
dissect_sna_control(tvbuff_t *parent_tvb, int offset, int control_len,
|
||||
proto_tree *tree, int hpr, enum parse parse)
|
||||
{
|
||||
tvbuff_t *tvb;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ typedef struct TETHERCAT_MBOX_HEADER
|
|||
|
||||
#define ETHERCAT_MBOX_HEADER_LEN ((int) sizeof(ETHERCAT_MBOX_HEADER))
|
||||
|
||||
/*/////////////////////////////////////////////////////////////////////////////*/
|
||||
/* EoE*/
|
||||
#define ETHERNET_FRAMENO_MASK 0x0000000F
|
||||
|
||||
|
|
@ -147,7 +146,6 @@ typedef struct TETHERCAT_EOE_HEADER
|
|||
} ETHERCAT_EOE_HEADER, *PETHERCAT_EOE_HEADER;
|
||||
#define ETHERCAT_EOE_HEADER_LEN ((int) sizeof(ETHERCAT_EOE_HEADER))
|
||||
|
||||
/*/////////////////////////////////////////////////////////////////////////////*/
|
||||
/* CANopen*/
|
||||
#define ETHERCAT_COE_TYPE_EMERGENCY 1
|
||||
#define ETHERCAT_COE_TYPE_SDOREQ 2
|
||||
|
|
|
|||
Loading…
Reference in New Issue