Skip to content

Remove use of SDWORD and SWORD in ODBC extensions (8.2) #14457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Remove use of SDWORD and SWORD in ODBC extensions (8.2) #14457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0987108
Remove usage of SDWORD, replace with SQLINTEGER
NattyNarwhal May 31, 2024
8c3ae13
Replace SWORD with SQLSMALLINT
NattyNarwhal May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/pdo_odbc/odbc_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ enum pdo_odbc_conv_result {
PDO_ODBC_CONV_FAIL
};

static int pdo_odbc_sqltype_is_unicode(pdo_odbc_stmt *S, SWORD sqltype)
static int pdo_odbc_sqltype_is_unicode(pdo_odbc_stmt *S, SQLSMALLINT sqltype)
{
if (!S->assume_utf8) return 0;
switch (sqltype) {
Expand Down Expand Up @@ -287,7 +287,7 @@ static int odbc_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *p
{
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
RETCODE rc;
SWORD sqltype = 0, ctype = 0, scale = 0, nullable = 0;
SQLSMALLINT sqltype = 0, ctype = 0, scale = 0, nullable = 0;
SQLULEN precision = 0;
pdo_odbc_param *P;
zval *parameter;
Expand Down Expand Up @@ -563,7 +563,7 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno)
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
struct pdo_column_data *col = &stmt->columns[colno];
RETCODE rc;
SWORD colnamelen;
SQLSMALLINT colnamelen;
SQLULEN colsize;
SQLLEN displaysize = 0;

Expand Down
4 changes: 2 additions & 2 deletions ext/pdo_odbc/php_pdo_odbc_int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
typedef struct {
char last_state[6];
char last_err_msg[SQL_MAX_MESSAGE_LENGTH];
SDWORD last_error;
SQLINTEGER last_error;
const char *file, *what;
int line;
} pdo_odbc_errinfo;
Expand All @@ -133,7 +133,7 @@ typedef struct {
char *data;
zend_ulong datalen;
SQLLEN fetched_len;
SWORD coltype;
SQLSMALLINT coltype;
char colname[128];
unsigned is_long;
unsigned is_unicode:1;
Expand Down
Loading