deuill
/
go-php
mirror of https://github.com/deuill/go-php.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename version-specific override functions for consistency

This commit is contained in:
Alex Palaistras 2016-05-05 22:37:40 +01:00
parent 3d31c927e3
commit ca3030252f
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/context.c
View File

@ -83,7 +83,7 @@ void *context_eval(engine_context *context, char *script) {
}
// Attempt to execute compiled string.
context_eval_proxy(op, &tmp);
_context_eval(op, &tmp);
// Allocate result value and copy temporary execution result in.
zval *result = malloc(sizeof(zval));
@ -95,7 +95,7 @@ void *context_eval(engine_context *context, char *script) {
void context_bind(engine_context *context, char *name, void *value) {
engine_value *v = (engine_value *) value;
context_bind_proxy(name, v->internal);
_context_bind(name, v->internal);
}
void context_destroy(engine_context *context) {

2
engine/engine.c
View File

@ -79,7 +79,7 @@ static sapi_module_struct engine_module = {
NULL, // Activate
NULL, // Deactivate
engine_ub_write_proxy, // Unbuffered Write
_engine_ub_write, // Unbuffered Write
NULL, // Flush
NULL, // Get UID
NULL, // Getenv

4
engine/include/php5/_context.h
View File

@ -5,7 +5,7 @@
#ifndef ___CONTEXT_H___
#define ___CONTEXT_H___
static void context_bind_proxy(char *name, zval *value);
static void context_eval_proxy(zend_op_array *op, zval *ret);
static void _context_bind(char *name, zval *value);
static void _context_eval(zend_op_array *op, zval *ret);
#endif

2
engine/include/php5/_engine.h
View File

@ -5,6 +5,6 @@
#ifndef ___ENGINE_H___
#define ___ENGINE_H___
static int engine_ub_write_proxy(const char *str, uint len);
static int _engine_ub_write(const char *str, uint len);
#endif

4
engine/include/php7/_context.h
View File

@ -5,7 +5,7 @@
#ifndef ___CONTEXT_H___
#define ___CONTEXT_H___
static void context_bind_proxy(char *name, zval *value);
static void context_eval_proxy(zend_op_array *op, zval *ret);
static void _context_bind(char *name, zval *value);
static void _context_eval(zend_op_array *op, zval *ret);
#endif

2
engine/include/php7/_engine.h
View File

@ -5,6 +5,6 @@
#ifndef ___ENGINE_H___
#define ___ENGINE_H___
static size_t engine_ub_write_proxy(const char *str, size_t len);
static size_t _engine_ub_write(const char *str, size_t len);
#endif

4
engine/src/php5/_context.c
View File

@ -2,11 +2,11 @@
// Use of this source code is governed by the MIT license that can be found in
// the LICENSE file.
static void context_bind_proxy(char *name, zval *value) {
static void _context_bind(char *name, zval *value) {
ZEND_SET_SYMBOL(EG(active_symbol_table), name, value);
}
static void context_eval_proxy(zend_op_array *op, zval *ret) {
static void _context_eval(zend_op_array *op, zval *ret) {
zend_op_array *oparr = EG(active_op_array);
zval *retval = NULL;
zval **retvalptr = EG(return_value_ptr_ptr);

2
engine/src/php5/_engine.c
View File

@ -2,6 +2,6 @@
// Use of this source code is governed by the MIT license that can be found in
// the LICENSE file.
static int engine_ub_write_proxy(const char *str, uint len) {
static int _engine_ub_write(const char *str, uint len) {
return engine_ub_write(str, len);
}

4
engine/src/php7/_context.c
View File

@ -2,11 +2,11 @@
// Use of this source code is governed by the MIT license that can be found in
// the LICENSE file.
static void context_bind_proxy(char *name, zval *value) {
static void _context_bind(char *name, zval *value) {
zend_hash_str_update(&EG(symbol_table), name, strlen(name), value);
}
static void context_eval_proxy(zend_op_array *op, zval *ret) {
static void _context_eval(zend_op_array *op, zval *ret) {
EG(no_extensions) = 1;
zend_try {

2
engine/src/php7/_engine.c
View File

@ -2,6 +2,6 @@
// Use of this source code is governed by the MIT license that can be found in
// the LICENSE file.
static size_t engine_ub_write_proxy(const char *str, size_t len) {
static size_t _engine_ub_write(const char *str, size_t len) {
return engine_ub_write(str, len);
}