diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-30 11:35:58 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 4bb784cd0d80c330364cdfebc824a434cc27f05a (patch) | |
| tree | 5fcc635378f27fed558af3d79491d84d991779a1 /ext/mysqlnd/mysqlnd_priv.h | |
| parent | fb1b5abe319cbb032d0de01938eff55f95a78650 (diff) | |
| download | php-git-4bb784cd0d80c330364cdfebc824a434cc27f05a.tar.gz | |
MNDR:
- make MYSQLND_ERROR_INFO a class
Diffstat (limited to 'ext/mysqlnd/mysqlnd_priv.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_priv.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h index abd475f63a..e3434c0785 100644 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@ -104,7 +104,19 @@ void mysqlnd_upsert_status_init(MYSQLND_UPSERT_STATUS * const upsert_status); (buf_len) = 0; \ } +enum_func_status mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, zend_bool persistent); + +#define SET_OOM_ERROR(info) SET_CLIENT_ERROR((info), CR_OUT_OF_MEMORY, UNKNOWN_SQLSTATE, mysqlnd_out_of_memory) +#define SET_EMPTY_ERROR(info) (info)->m->reset((info)) +#define SET_CLIENT_ERROR(info, err_no, sqlstate, error) (info)->m->set_client_error((info), (err_no), (sqlstate), (error)) +#define COPY_CLIENT_ERROR(error_info_to, error_info_from) \ + { \ + SET_CLIENT_ERROR((error_info_to), (error_info_from).error_no, (error_info_from).sqlstate, (error_info_from).error); \ + } + + +#if 0 #define SET_EMPTY_ERROR(error_info) \ { \ (error_info).error_no = 0; \ @@ -115,7 +127,6 @@ void mysqlnd_upsert_status_init(MYSQLND_UPSERT_STATUS * const upsert_status); } \ } - #define SET_CLIENT_ERROR(error_info, a, b, c) \ { \ if (0 == (a)) { \ @@ -137,18 +148,10 @@ void mysqlnd_upsert_status_init(MYSQLND_UPSERT_STATUS * const upsert_status); } \ } \ } +#endif -#define COPY_CLIENT_ERROR(error_info_to, error_info_from) \ - { \ - SET_CLIENT_ERROR((error_info_to), (error_info_from).error_no, (error_info_from).sqlstate, (error_info_from).error); \ - } - - -#define SET_OOM_ERROR(error_info) SET_CLIENT_ERROR((error_info), CR_OUT_OF_MEMORY, UNKNOWN_SQLSTATE, mysqlnd_out_of_memory) - - -#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR(*(stmt)->error_info, a, b, c) +#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR((stmt)->error_info, a, b, c) #define CONN_GET_STATE(c) (c)->m->get_state((c)) #define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s)) |