diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /ext/mysqli/mysqli_warning.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'ext/mysqli/mysqli_warning.c')
| -rw-r--r-- | ext/mysqli/mysqli_warning.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index 3c86bee800..0f39ba2edc 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -29,7 +29,7 @@ #include "mysqli_priv.h" /* Define these in the PHP5 tree to make merging easy process */ -#define ZSTR_DUPLICATE (1<<0) +#define Zzend_string_dupLICATE (1<<0) #define ZSTR_AUTOFREE (1<<1) #define ZVAL_UTF8_STRING(z, s, flags) ZVAL_STRING((z), (char*)(s)) @@ -59,9 +59,9 @@ MYSQLI_WARNING *php_new_warning(const char *reason, int errorno TSRMLS_DC) w = (MYSQLI_WARNING *)ecalloc(1, sizeof(MYSQLI_WARNING)); - ZVAL_UTF8_STRING(&(w->reason), reason, ZSTR_DUPLICATE); + ZVAL_UTF8_STRING(&(w->reason), reason, Zzend_string_dupLICATE); - ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, ZSTR_DUPLICATE); + ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, Zzend_string_dupLICATE); w->errorno = errorno; @@ -108,9 +108,9 @@ MYSQLI_WARNING *php_new_warning(const zval * reason, int errorno TSRMLS_DC) ZVAL_DUP(&w->reason, (zval *)reason); convert_to_string(&w->reason); - //????ZVAL_UTF8_STRINGL(&(w->reason), Z_STRVAL(w->reason), Z_STRSIZE(w->reason), ZSTR_AUTOFREE); + //????ZVAL_UTF8_STRINGL(&(w->reason), Z_STRVAL(w->reason), Z_STRLEN(w->reason), ZSTR_AUTOFREE); - ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, ZSTR_DUPLICATE); + ZVAL_UTF8_STRINGL(&(w->sqlstate), "HY000", sizeof("HY000") - 1, Zzend_string_dupLICATE); w->errorno = errorno; @@ -147,7 +147,7 @@ MYSQLI_WARNING * php_get_warnings(MYSQLND_CONN_DATA * mysql TSRMLS_DC) /* 1. Here comes the error no */ entry = zend_hash_get_current_data(Z_ARRVAL(row)); convert_to_int_ex(entry); - errno = Z_IVAL_P(entry); + errno = Z_LVAL_P(entry); zend_hash_move_forward(Z_ARRVAL(row)); /* 2. Here comes the reason */ @@ -243,7 +243,7 @@ zval *mysqli_warning_errno(mysqli_object *obj, zval *retval TSRMLS_DC) return NULL; } w = (MYSQLI_WARNING *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; - ZVAL_INT(retval, w->errorno); + ZVAL_LONG(retval, w->errorno); return retval; } /* }}} */ |