From de61c5e85c2d248728b84d27bec6457a6561c1db Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Mon, 13 May 2024 11:49:03 -0400 Subject: [PATCH] _blk_get_col_data: Consistently return TDS_FAIL on failure. Most failure scenarios accidentally returned CS_FAIL, which ironically corresponds to TDS_SUCCESS. Signed-off-by: Aaron M. Ucko --- src/ctlib/blk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ctlib/blk.c b/src/ctlib/blk.c index 34aeaccdd4..079d6dff80 100644 --- a/src/ctlib/blk.c +++ b/src/ctlib/blk.c @@ -693,7 +693,7 @@ _blk_get_col_data(TDSBCPINFO *bulk, TDSCOLUMN *bindcol, int offset) default: tdsdump_log(TDS_DBG_ERROR, "Not fixed length type (%d) and datalen not specified\n", bindcol->column_bindtype); - return CS_FAIL; + return TDS_FAIL; } } else { @@ -717,7 +717,7 @@ _blk_get_col_data(TDSBCPINFO *bulk, TDSCOLUMN *bindcol, int offset) if (desttype == CS_ILLEGAL_TYPE) desttype = _ct_get_client_type(bindcol, false); if (desttype == CS_ILLEGAL_TYPE) - return CS_FAIL; + return TDS_FAIL; destfmt.datatype = desttype; destfmt.maxlength = bindcol->on_server.column_size; destfmt.precision = bindcol->column_prec; @@ -728,7 +728,7 @@ _blk_get_col_data(TDSBCPINFO *bulk, TDSCOLUMN *bindcol, int offset) if ((result = _cs_convert(ctx, &srcfmt, (CS_VOID *) src, &destfmt, (CS_VOID *) bindcol->bcp_column_data->data, &destlen)) != CS_SUCCEED) { tdsdump_log(TDS_DBG_INFO1, "convert failed for %d \n", srctype); - return CS_FAIL; + return TDS_FAIL; } }