Permalink
Browse files

Remove use of php_ignore_value

This was a macro wrapping (void*). Given the sad state of
the Zend headers we can't compile with that high warning
level anyway.

Change-Id: I0f8196b1252d1abf42f7f9764592828a613ba0d0
Reviewed-on: http://review.couchbase.org/23244
Tested-by: Trond Norbye <trond.norbye@gmail.com>
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
  • Loading branch information...
trondn committed Dec 12, 2012
1 parent 0e6971a commit e984517bf70ffe382aed8013f82e314fe1402229
Showing with 1 addition and 11 deletions.
  1. +1 −1 couchbase.c
  2. +0 −1 get.c
  3. +0 −4 php_couchbase.h
  4. +0 −2 stat.c
  5. +0 −2 store.c
  6. +0 −1 version.c
View
@@ -95,7 +95,7 @@ void php_couchbase_setup_callbacks(lcb_t handle)
php_couchbase_callbacks_version_init(handle);
php_couchbase_callbacks_unlock_init(handle);
- php_ignore_value(lcb_set_error_callback(handle, php_couchbase_error_callback));
+ lcb_set_error_callback(handle, php_couchbase_error_callback);
}
PHP_COUCHBASE_LOCAL
View
1 get.c
@@ -19,7 +19,6 @@ php_couchbase_get_callback(lcb_t instance,
TSRMLS_FETCH();
- php_ignore_value(instance);
if (--ctx->res->seqno == 0) {
pcbc_stop_loop(ctx->res);
View
@@ -39,10 +39,6 @@ extern zend_class_entry *couchbase_ce;
#define COUCHBASE_G(v) (couchbase_globals.v)
#endif
-#ifndef php_ignore_value
-#define php_ignore_value(x) ((void) (x))
-#endif
-
#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION > 2)
#define COUCHBASE_ARG_PREFIX
#else
View
2 stat.c
@@ -31,8 +31,6 @@ static void php_couchbase_stat_callback(lcb_t handle,
size_t nkey = resp->v.v0.nkey;
const void *bytes = resp->v.v0.bytes;
- php_ignore_value(handle);
-
if (resp->version != 0) {
error = LCB_ERROR;
}
View
@@ -10,8 +10,6 @@ static void php_couchbase_store_callback(lcb_t instance,
const void *key;
size_t nkey;
uint64_t cas;
- php_ignore_value(instance);
- php_ignore_value(operation);
if (--ctx->res->seqno == 0) {
pcbc_stop_loop(ctx->res);
View
@@ -28,7 +28,6 @@ static void php_couchbase_version_callback(lcb_t handle,
const char *server_endpoint = resp->v.v0.server_endpoint;
const char *version_string = resp->v.v0.vstring;
lcb_size_t nversion_string = resp->v.v0.nvstring;
- php_ignore_value(handle);
if (error != LCB_SUCCESS) {
ctx->res->rc = error;

0 comments on commit e984517

Please sign in to comment.