archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Various compiler warning fixes.

Browse source
This commit is contained in:
Ilia Alshanetsky 2005-05-18 22:40:56 +00:00
parent 92c8c09da5
commit fa0e534f83
5 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/pdo/php_pdo_driver.h
View file

@ -105,7 +105,7 @@ enum pdo_fetch_orientation {
PDO_FETCH_ORI_FIRST, /* scroll to the first row and fetch that */
PDO_FETCH_ORI_LAST, /* scroll to the last row and fetch that */
PDO_FETCH_ORI_ABS, /* scroll to an absolute numbered row and fetch that */
PDO_FETCH_ORI_REL, /* scroll relative to the current row, and fetch that */
PDO_FETCH_ORI_REL /* scroll relative to the current row, and fetch that */
};
enum pdo_attribute_type {
@ -132,7 +132,7 @@ enum pdo_attribute_type {
enum pdo_cursor_type {
PDO_CURSOR_FWDONLY, /* forward only cursor (default) */
PDO_CURSOR_SCROLL, /* scrollable cursor */
PDO_CURSOR_SCROLL /* scrollable cursor */
};
/* SQL-92 SQLSTATE error codes.
@ -170,7 +170,7 @@ typedef char pdo_error_type[6]; /* SQLSTATE */
#define PDO_ERR_DISCONNECTED,
#define PDO_ERR_NO_PERM,
PDO_ERR_CANT_MAP, /* no way to map native error to the generic
PDO_ERR_CANT_MAP /* no way to map native error to the generic
* codes; consult the native error for more info */
};
#endif
@ -178,7 +178,7 @@ typedef char pdo_error_type[6]; /* SQLSTATE */
enum pdo_error_mode {
PDO_ERRMODE_SILENT, /* just set error codes */
PDO_ERRMODE_WARNING, /* raise E_WARNING */
PDO_ERRMODE_EXCEPTION, /* throw exceptions */
PDO_ERRMODE_EXCEPTION /* throw exceptions */
};
enum pdo_case_conversion {
@ -327,7 +327,7 @@ enum pdo_param_event {
PDO_PARAM_EVT_EXEC_PRE,
PDO_PARAM_EVT_EXEC_POST,
PDO_PARAM_EVT_FETCH_PRE,
PDO_PARAM_EVT_FETCH_POST,
PDO_PARAM_EVT_FETCH_POST
};
typedef int (*pdo_stmt_param_hook_func)(pdo_stmt_t *stmt, struct pdo_bound_param_data *param, enum pdo_param_event event_type TSRMLS_DC);

1
ext/pdo_mysql/mysql_driver.c
View file

@ -46,7 +46,6 @@ int _pdo_mysql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int lin
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
pdo_error_type *pdo_err;
pdo_mysql_error_info *einfo;
char *sqlstate = NULL;
if (stmt) {
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;

1
ext/pdo_mysql/mysql_statement.c
View file

@ -115,7 +115,6 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt,
static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
{
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
MYSQL_RES *R = S->result;
struct pdo_column_data *cols = stmt->columns;
unsigned int i;

2
ext/pdo_pgsql/pgsql_driver.c
View file

@ -215,7 +215,7 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, unsigned
/* TODO: if name != NULL, pull out last value for that sequence/column */
*len = spprintf(&id, 0, "%ld", H->pgoid);
*len = spprintf(&id, 0, "%lld", H->pgoid);
return id;
}

1
ext/pdo_pgsql/pgsql_statement.c
View file

@ -327,7 +327,6 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned
{
pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
struct pdo_column_data *cols = stmt->columns;
char *tmp_ptr;
size_t tmp_len;
if (!S->result) {