Skip to content

Commit

Permalink
php_set_error_handling removed because it is deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
@esminis
esminis committed May 7, 2016
1 parent 754a5cc commit 1ebc7f2
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 38 deletions.
6 changes: 6 additions & 0 deletions lib/hash-algorithms.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
| Authors: Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/

// Added to support uint32_t on linux because it is defined in stdint.h
#include "php.h"
#include "zend.h"
#include "zend_API.h"

#if HAVE_CONFIG_H
# include <config.h>
#endif
Expand Down
6 changes: 6 additions & 0 deletions lib/quickhash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
| Authors: Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/

// Added to support uint32_t on linux because it is defined in stdint.h
#include "php.h"
#include "zend.h"
#include "zend_API.h"

#if HAVE_CONFIG_H
# include <config.h>
#endif
Expand Down
24 changes: 16 additions & 8 deletions qh_inthash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,10 @@ PHP_METHOD(QuickHashIntHash, loadFromFile)
long size = 0, flags = 0;
php_stream *stream;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &filename, &filename_len, &size, &flags) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

Expand All @@ -316,7 +318,7 @@ PHP_METHOD(QuickHashIntHash, loadFromFile)
qh_inthash_initialize_from_file(zend_object_store_get_object(return_value TSRMLS_CC), stream, size, flags TSRMLS_CC);
php_stream_close(stream);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand All @@ -340,8 +342,10 @@ PHP_METHOD(QuickHashIntHash, saveToFile)
php_qh_inthash_obj *inthash_obj;
php_stream *stream;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, qh_ce_inthash, &filename, &filename_len) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

Expand All @@ -356,7 +360,7 @@ PHP_METHOD(QuickHashIntHash, saveToFile)
qh_inthash_save_to_file(stream, inthash_obj);
php_stream_close(stream);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand Down Expand Up @@ -407,14 +411,16 @@ PHP_METHOD(QuickHashIntHash, loadFromString)
int contents_len;
long size = 0, flags = 0;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &contents, &contents_len, &size, &flags) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

qh_instantiate(qh_ce_inthash, return_value TSRMLS_CC);
qh_inthash_initialize_from_string(zend_object_store_get_object(return_value TSRMLS_CC), contents, contents_len, size, flags TSRMLS_CC);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand All @@ -440,15 +446,17 @@ PHP_METHOD(QuickHashIntHash, saveToString)
char *string;
uint32_t string_len;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, qh_ce_inthash) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

inthash_obj = (php_qh_inthash_obj *) zend_object_store_get_object(object TSRMLS_CC);

string = qh_inthash_save_to_string(&string_len, inthash_obj);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
RETURN_STRINGL(string, string_len, 0);
}
/* }}} */
29 changes: 19 additions & 10 deletions qh_intset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,14 @@ PHP_METHOD(QuickHashIntSet, __construct)
long size;
long flags = 0;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &size, &flags) == SUCCESS) {
if (!qh_intset_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), size, flags TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize set.");
}
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand Down Expand Up @@ -297,8 +298,10 @@ PHP_METHOD(QuickHashIntSet, loadFromFile)
long size = 0, flags = 0;
php_stream *stream;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &filename, &filename_len, &size, &flags) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

Expand All @@ -312,7 +315,7 @@ PHP_METHOD(QuickHashIntSet, loadFromFile)
qh_intset_initialize_from_file(zend_object_store_get_object(return_value TSRMLS_CC), stream, size, flags TSRMLS_CC);
php_stream_close(stream);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand All @@ -336,8 +339,10 @@ PHP_METHOD(QuickHashIntSet, saveToFile)
php_qh_intset_obj *intset_obj;
php_stream *stream;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, qh_ce_intset, &filename, &filename_len) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

Expand All @@ -352,7 +357,7 @@ PHP_METHOD(QuickHashIntSet, saveToFile)
qh_intset_save_to_file(stream, intset_obj);
php_stream_close(stream);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand Down Expand Up @@ -394,14 +399,16 @@ PHP_METHOD(QuickHashIntSet, loadFromString)
int contents_len;
long size = 0, flags = 0;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &contents, &contents_len, &size, &flags) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

qh_instantiate(qh_ce_intset, return_value TSRMLS_CC);
qh_intset_initialize_from_string(zend_object_store_get_object(return_value TSRMLS_CC), contents, contents_len, size, flags TSRMLS_CC);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand All @@ -427,15 +434,17 @@ PHP_METHOD(QuickHashIntSet, saveToString)
char *string;
uint32_t string_len;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, qh_ce_intset) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

intset_obj = (php_qh_intset_obj *) zend_object_store_get_object(object TSRMLS_CC);

string = qh_intset_save_to_string(&string_len, intset_obj);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
RETURN_STRINGL(string, string_len, 0);
}
/* }}} */
29 changes: 19 additions & 10 deletions qh_intstringhash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,14 @@ PHP_METHOD(QuickHashIntStringHash, __construct)
long size;
long flags = 0;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &size, &flags) == SUCCESS) {
if (!qh_intstringhash_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), size, flags TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize hash.");
}
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand Down Expand Up @@ -323,8 +324,10 @@ PHP_METHOD(QuickHashIntStringHash, loadFromFile)
long size = 0, flags = 0;
php_stream *stream;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &filename, &filename_len, &size, &flags) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

Expand All @@ -338,7 +341,7 @@ PHP_METHOD(QuickHashIntStringHash, loadFromFile)
qh_intstringhash_initialize_from_file(zend_object_store_get_object(return_value TSRMLS_CC), stream, size, flags TSRMLS_CC);
php_stream_close(stream);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand All @@ -362,8 +365,10 @@ PHP_METHOD(QuickHashIntStringHash, saveToFile)
php_qh_intstringhash_obj *intstringhash_obj;
php_stream *stream;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, qh_ce_intstringhash, &filename, &filename_len) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

Expand All @@ -378,7 +383,7 @@ PHP_METHOD(QuickHashIntStringHash, saveToFile)
qh_intstringhash_save_to_file(stream, intstringhash_obj);
php_stream_close(stream);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand Down Expand Up @@ -431,14 +436,16 @@ PHP_METHOD(QuickHashIntStringHash, loadFromString)
int contents_len;
long size = 0, flags = 0;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &contents, &contents_len, &size, &flags) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

qh_instantiate(qh_ce_intstringhash, return_value TSRMLS_CC);
qh_intstringhash_initialize_from_string(zend_object_store_get_object(return_value TSRMLS_CC), contents, contents_len, size, flags TSRMLS_CC);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
/* }}} */

Expand All @@ -464,15 +471,17 @@ PHP_METHOD(QuickHashIntStringHash, saveToString)
char *string;
uint32_t string_len;

php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, qh_ce_intstringhash) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}

intstringhash_obj = (php_qh_intstringhash_obj *) zend_object_store_get_object(object TSRMLS_CC);

string = qh_intstringhash_save_to_string(&string_len, intstringhash_obj);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
zend_restore_error_handling(&error_handling TSRMLS_CC);
RETURN_STRINGL(string, string_len, 0);
}
/* }}} */
Loading

0 comments on commit 1ebc7f2

Please sign in to comment.