Skip to content

Commit e6facc4

Browse files
committed
bulk.c: Address some implicit conversion warnings.
Cast away harmless discrepancies, mostly by taking advantage of TDS_PUT_BYTE. Signed-off-by: Aaron M. Ucko <[email protected]>
1 parent 24d5252 commit e6facc4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/tds/bulk.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ tds5_send_record(TDSSOCKET *tds, TDSBCPINFO *bcpinfo,
507507
return rc;
508508
/* unknown but zero */
509509
tds_put_smallint(tds, 0);
510-
tds_put_byte(tds, bindcol->on_server.column_type);
510+
TDS_PUT_BYTE(tds, bindcol->on_server.column_type);
511511
tds_put_byte(tds, 0xff - bcpinfo->blob_cols);
512512
/*
513513
* offset of txptr we stashed during variable
@@ -733,7 +733,7 @@ tds5_bcp_add_variable_columns(TDSBCPINFO *bcpinfo, tds_bcp_get_col_data get_col_
733733
* Is this column of "variable" type, i.e. NULLable
734734
* or naturally variable length e.g. VARCHAR
735735
*/
736-
if (bcpinfo->sybase_count > i) {
736+
if (bcpinfo->sybase_count > (TDS_INT) i) {
737737
if (bcpinfo->sybase_colinfo[i].offset >= 0)
738738
continue;
739739
} else {
@@ -907,7 +907,7 @@ tds7_bcp_send_colmetadata(TDSSOCKET *tds, TDSBCPINFO *bcpinfo)
907907
else
908908
tds_put_smallint(tds, bcpcol->column_usertype);
909909
tds_put_smallint(tds, bcpcol->column_flags);
910-
tds_put_byte(tds, bcpcol->on_server.column_type);
910+
TDS_PUT_BYTE(tds, bcpcol->on_server.column_type);
911911

912912
assert(bcpcol->funcs);
913913
bcpcol->funcs->put_info(tds, bcpcol);

0 commit comments

Comments
 (0)