osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GCC warning fixes 

epan/dissectors/
packet-bctp.c:
	no newline at end of file
packet-epl.c:
	C++ style comments are not allowed in ISO C90
packet-sccp.c:
	missing initializer
packet-sccp.h:
	comma at end of enumerator list
packet-sctp.c:
	suggest parentheses around assignment used as truth value
packet-vnc.c:
	control reaches end of non-void function
	pointer targets in passing argument 1 of 'g_strtod' differ in
		signedness
	pointer targets in passing argument 3 of 'vnc_client_to_server'
		differ in signedness
gtk/
main.c:
	C++ style comments are not allowed in ISO C90
u3.h:
	function declaration isn't a prototype

Other (trivial) stuff
packet-sccp.h:
	Add svn properties


svn path=/trunk/; revision=21011
This commit is contained in:
Jörg Mayer 2007-03-09 13:14:09 +00:00
parent 147d66441e
commit fb820f0a07
8 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-bctp.c
View File

@ -117,4 +117,5 @@ proto_reg_handoff_bctp(void)
{
data_handle = find_dissector("data");
text_handle = find_dissector("data-text-lines");
}
}

2
epan/dissectors/packet-epl.c
View File

@ -1116,7 +1116,7 @@ dissect_epl_sdo_command(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo,
offset += 7;
}
// adjust size of packet
/* adjust size of packet */
tvb_set_reported_length(tvb, offset + segment_size);
if (segmented == EPL_ASND_SDO_CMD_SEGMENTATION_INITIATE_TRANSFER)

2
epan/dissectors/packet-sccp.c
View File

@ -740,7 +740,7 @@ static dissector_table_t sccp_ssn_dissector_table;
static emem_tree_t* assocs = NULL;
static sccp_assoc_info_t* assoc;
static sccp_assoc_info_t no_assoc = {0,0,0,0,0,FALSE,FALSE,NULL,SCCP_PLOAD_NONE,NULL};
static sccp_assoc_info_t no_assoc = {0,0,0,0,0,FALSE,FALSE,NULL,SCCP_PLOAD_NONE,NULL,NULL};
static gboolean trace_sccp = FALSE;
static guint32 next_assoc_id = 0;

36
epan/dissectors/packet-sccp.h
View File

@ -1,7 +1,7 @@
/* packet-sccp.h
* Definitions for Signalling Connection Control Part (SCCP) dissection
*
* $Id: $
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -27,35 +27,35 @@
typedef enum _sccp_payload_t {
SCCP_PLOAD_NONE,
SCCP_PLOAD_BSSAP,
SCCP_PLOAD_RANAP,
SCCP_PLOAD_BSSAP,
SCCP_PLOAD_RANAP,
SCCP_PLOAD_TCAP,
SCCP_PLOAD_CAMEL,
SCCP_PLOAD_CAMEL
} sccp_payload_t;
/* obscure to SCCP, to be defined by users */
typedef struct _sccp_msg_payload_data_t sccp_msg_payload_data_t;
typedef struct _sccp_assoc_data_t sccp_assoc_data_t;
typedef struct _sccp_msg_info_t {
guint framenum;
guint offset;
gchar* info;
sccp_msg_payload_data_t* private_data;
struct _sccp_msg_info_t* next;
} sccp_msg_info_t;
typedef struct _sccp_msg_payload_data_t sccp_msg_payload_data_t;
typedef struct _sccp_assoc_data_t sccp_assoc_data_t;
typedef struct _sccp_assoc_info_t {
typedef struct _sccp_msg_info_t {
guint framenum;
guint offset;
gchar* info;
sccp_msg_payload_data_t* private_data;
struct _sccp_msg_info_t* next;
} sccp_msg_info_t;
typedef struct _sccp_assoc_info_t {
guint32 id;
guint32 calling_dpc;
guint32 called_dpc;
guint8 calling_ssn;
guint8 called_ssn;
guint8 called_ssn;
gboolean has_calling_key;
gboolean has_called_key;
gboolean has_called_key;
sccp_msg_info_t* msgs;
sccp_payload_t pload;
sccp_assoc_data_t* private_data;
sccp_assoc_data_t* private_data;
sccp_msg_info_t* cur_msg;
} sccp_assoc_info_t;

2
epan/dissectors/packet-sctp.c
View File

@ -814,7 +814,7 @@ static void sctp_ack_block(packet_info* pinfo, sctp_half_assoc_t* h, tvbuff_t* t
}
if (t = emem_tree_lookup32(h->peer->tsn_acks, framenum)) {
if ((t = emem_tree_lookup32(h->peer->tsn_acks, framenum))) {
for(;t;t = t->next) {
guint32 tsn = t->tsn;

9
epan/dissectors/packet-vnc.c
View File

@ -379,7 +379,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 num_security_types;
guint32 text_len; /* Part of: Client Cut Text & Server Cut Text */
guint32 auth_result, desktop_name_len;
guint offset = 0;
gint offset = 0;
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti=NULL;
@ -506,7 +506,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(vnc_tree, hf_vnc_server_proto_ver, tvb, 4,
7, FALSE);
per_conversation_info->server_proto_ver =
g_strtod(tvb_get_ephemeral_string(tvb, 4, 7), NULL);
g_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO,
@ -519,7 +519,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(vnc_tree, hf_vnc_client_proto_ver, tvb, 4,
7, FALSE);
per_conversation_info->client_proto_ver =
g_strtod(tvb_get_ephemeral_string(tvb, 4, 7), NULL);
g_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO,
@ -1524,6 +1524,7 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
*offset, 2, FALSE);
*offset += 2;
}
return *offset;
}
@ -1558,6 +1559,8 @@ vnc_server_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
proto_tree_add_item(tree, hf_vnc_server_cut_text, tvb, *offset,
text_len, FALSE);
*offset += text_len;
return *offset;
}

6
gtk/main.c
View File

@ -4563,16 +4563,16 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
if(airpcap_if_list == NULL) {
/*No airpcap device found */
airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
/** //recent.airpcap_toolbar_show = TRUE; **/
/* recent.airpcap_toolbar_show = TRUE; */
} else {
/* default adapter is not airpcap... or is airpcap but is not found*/
airpcap_set_toolbar_stop_capture(airpcap_if_active);
airpcap_enable_toolbar_widgets(airpcap_tb,FALSE);
//recent.airpcap_toolbar_show = TRUE;
/* recent.airpcap_toolbar_show = TRUE; */
}
} else {
airpcap_set_toolbar_stop_capture(airpcap_if_active);
//recent.airpcap_toolbar_show = TRUE;
/* recent.airpcap_toolbar_show = TRUE; */
}
#endif

2
gtk/u3.h
View File

@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
gboolean u3_active();
gboolean u3_active(void);
void u3_runtime_info(GString *str);