diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-17 20:18:25 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-17 20:18:25 +0200 |
| commit | 5c95226d50e565b43d9e7f2d4ff4deeaf7ec8942 (patch) | |
| tree | 309a2e9430f04fda13e808e1ea00b8b27f388116 /ext/pdo_mysql | |
| parent | 90d9adccec42559d08487ae144e947df30ab820e (diff) | |
| download | php-git-5c95226d50e565b43d9e7f2d4ff4deeaf7ec8942.tar.gz | |
Various warning fixes
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 17bace7882..3d4108dd59 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -43,7 +43,12 @@ #define PDO_DBG_ERR(msg) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0) #define PDO_DBG_INF_FMT(...) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0) #define PDO_DBG_ERR_FMT(...) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); } while (0) -#define PDO_DBG_ENTER(func_name) zend_bool dbg_skip_trace = TRUE; if (PDO_MYSQL_G(dbg)) dbg_skip_trace = !PDO_MYSQL_G(dbg)->m->func_enter(PDO_MYSQL_G(dbg), __LINE__, __FILE__, func_name, strlen(func_name)); +#define PDO_DBG_ENTER(func_name) \ + zend_bool dbg_skip_trace = TRUE; \ + ((void) dbg_skip_trace); \ + if (PDO_MYSQL_G(dbg)) \ + dbg_skip_trace = !PDO_MYSQL_G(dbg)->m->func_enter(PDO_MYSQL_G(dbg), __LINE__, __FILE__, func_name, strlen(func_name)); + #define PDO_DBG_RETURN(value) do { if (PDO_MYSQL_G(dbg)) PDO_MYSQL_G(dbg)->m->func_leave(PDO_MYSQL_G(dbg), __LINE__, __FILE__, 0); return (value); } while (0) #define PDO_DBG_VOID_RETURN do { if (PDO_MYSQL_G(dbg)) PDO_MYSQL_G(dbg)->m->func_leave(PDO_MYSQL_G(dbg), __LINE__, __FILE__, 0); return; } while (0) |