aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-03-09 23:00:21 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-03-09 23:00:21 +0000
commit2f73c1d242473fff8fcc374c4744bbb9df7ca8d7 (patch)
tree41c0ee7a945cecbfbf465d314c0a76ef215b7ef8
parente16aebe91983c02cfd5aa2d98578c5757b68c0f6 (diff)
removed some MSVC compiler warnings, mostly I've casted "downsized function parameters"
svn path=/trunk/; revision=13684
-rw-r--r--epan/dissectors/packet-bssgp.c2
-rw-r--r--epan/dissectors/packet-dtp.c2
-rw-r--r--epan/dissectors/packet-fcp.c4
-rw-r--r--epan/dissectors/packet-iscsi.c8
-rw-r--r--gtk/stats_tree_stat.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 1e2d5c3ce1..25b00ec0e3 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -1243,7 +1243,7 @@ decode_nri(proto_tree *tf, build_info_t *bi, guint32 tmsi_tlli) {
if (bssgp_decode_nri && (bssgp_nri_length > 0) &&
(((tmsi_tlli & LOCAL_TLLI_MASK) == LOCAL_TLLI_MASK) ||
((tmsi_tlli & FOREIGN_TLLI_MASK) == FOREIGN_TLLI_MASK))) {
- nri = get_masked_guint32(tmsi_tlli, make_mask32(bssgp_nri_length, 8));
+ nri = get_masked_guint32(tmsi_tlli, make_mask32( (guint8) bssgp_nri_length, 8));
if (tf) {
proto_tree_add_uint_hidden(tf, hf_bssgp_nri, bi->tvb, bi->offset, 4,
nri);
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 563c62b64e..4f6bc3af9b 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -111,7 +111,7 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (valuelength > 0) {
- dissect_dtp_tlv(tvb, offset, valuelength, tlv_tree, ti, type);
+ dissect_dtp_tlv(tvb, offset, valuelength, tlv_tree, ti, (guint8) type);
}
offset += valuelength;
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index bf579c3c2c..58ddfddcea 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -384,7 +384,7 @@ dissect_fcp_data (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_uint_hidden (fcp_tree, hf_fcp_singlelun, tvb,
0, 0, cdata->fcp_lun);
- dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, cdata->fcp_dl, cdata->fcp_lun);
+ dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, cdata->fcp_dl, (guint16) cdata->fcp_lun);
}
else {
dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, 0, 0xffff);
@@ -480,7 +480,7 @@ dissect_fcp_rsp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (flags & 0x2) {
dissect_scsi_snsinfo (tvb, pinfo, tree, offset+24+rsplen,
tvb_get_ntohl (tvb, offset+16),
- cdata?cdata->fcp_lun:0xffff);
+ (guint16) (cdata?cdata->fcp_lun:0xffff) );
}
if (cdata) {
g_mem_chunk_free (fcp_req_vals, cdata);
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 17eae02be1..b6a8f29c08 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -1675,7 +1675,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
~I_BIT)) == ISCSI_OPCODE_SCSI_COMMAND) {
/* SCSI Command */
dissect_scsi_cdb (tvb, pinfo, tree, cdb_offset, 16, SCSI_DEV_UNKNOWN,
- cdata?cdata->lun:0xffff);
+ (guint16) (cdata?cdata->lun:0xffff) );
}
else if (opcode == ISCSI_OPCODE_SCSI_RESPONSE) {
if (scsi_status == 0x2) {
@@ -1691,12 +1691,12 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
iscsi_min (senseLen,
end_offset-offset),
- cdata?cdata->lun:0xffff);
+ (guint16) (cdata?cdata->lun:0xffff) );
}
}
else {
dissect_scsi_rsp (tvb, pinfo, tree,
- cdata?cdata->lun:0xffff, scsi_status);
+ (guint16) (cdata?cdata->lun:0xffff), scsi_status);
}
}
else if ((opcode == ISCSI_OPCODE_SCSI_DATA_IN) ||
@@ -1705,7 +1705,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
dissect_scsi_payload (tvb, pinfo, tree, offset,
(opcode==ISCSI_OPCODE_SCSI_DATA_OUT),
iscsi_min (data_segment_len, end_offset-offset),
- cdata?cdata->lun:0xffff);
+ (guint16) (cdata?cdata->lun:0xffff) );
}
}
diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c
index ba6321cd8c..3b6b463e58 100644
--- a/gtk/stats_tree_stat.c
+++ b/gtk/stats_tree_stat.c
@@ -291,7 +291,7 @@ static void init_gtk_tree(char* optarg) {
gtk_tree_view_column_set_sizing(column,GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column (GTK_TREE_VIEW (st->pr->tree), column);
#else
- st->pr->textbox = GTK_TEXT(gtk_text_new(NULL,NULL));
+ st->pr->textbox = gtk_text_new(NULL,NULL);
gtk_text_set_editable(GTK_TEXT(st->pr->textbox),TRUE);
gtk_container_add( GTK_CONTAINER(scr_win), GTK_WIDGET(st->pr->textbox));
gtk_container_add( GTK_CONTAINER(st->pr->win), scr_win);