From 85f1b218a54a6741d7659fc89f18883ccaff14be Mon Sep 17 00:00:00 2001 From: Gasol Wu Date: Thu, 9 Oct 2014 01:20:55 +0800 Subject: [PATCH] Make build sucessful --- php/r3/php_r3.c | 32 +------------------------------- php/r3/php_r3.h | 4 ++-- php/r3/r3_functions.c | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/php/r3/php_r3.c b/php/r3/php_r3.c index 28a0de4..2e5139b 100644 --- a/php/r3/php_r3.c +++ b/php/r3/php_r3.c @@ -14,7 +14,7 @@ #include "php_r3.h" // #include "ct_helper.h" -// #include "r3_functions.h" +#include "r3_functions.h" // #include "r3_mux.h" // #include "php_expandable_mux.h" // #include "r3_controller.h" @@ -104,33 +104,3 @@ PHP_MSHUTDOWN_FUNCTION(r3) { PHP_RINIT_FUNCTION(r3) { return SUCCESS; } - - -/* - * r3_compile(array $routes, string $path); - */ -PHP_FUNCTION(r3_match) -{ - zval *z_routes; - char *path; - int path_len; - - /* parse parameters */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "as", - &z_routes, - &path, &path_len ) == FAILURE) { - RETURN_FALSE; - } - - /* - zval *z_route; - z_route = php_r3_match(z_routes, path, path_len TSRMLS_CC); - if ( z_route != NULL ) { - *return_value = *z_route; - zval_copy_ctor(return_value); - return; - } - */ - RETURN_NULL(); -} - diff --git a/php/r3/php_r3.h b/php/r3/php_r3.h index 03a4351..2fad971 100644 --- a/php/r3/php_r3.h +++ b/php/r3/php_r3.h @@ -82,8 +82,8 @@ zval * call_mux_method(zval * object , char * method_name , int method_name_len, zend_class_entry ** get_pattern_compiler_ce(TSRMLS_D); -extern zend_class_entry *ce_r3_exception; */ +extern zend_class_entry *ce_r3_exception; extern zend_module_entry r3_module_entry; @@ -91,7 +91,7 @@ void r3_init_exception(TSRMLS_D); void r3_mux_le_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); -PHP_FUNCTION(r3_match); +// PHP_FUNCTION(r3_match); #define phpext_r3_ptr &r3_module_entry diff --git a/php/r3/r3_functions.c b/php/r3/r3_functions.c index 33544b9..c6df614 100644 --- a/php/r3/r3_functions.c +++ b/php/r3/r3_functions.c @@ -20,7 +20,7 @@ vim:fdm=marker:et:sw=4:ts=4:sts=4: // #include "r3_persistent.h" // #include "php_expandable_mux.h" -// #include "hash.h" +#include "hash.h" /** * new_dst = ht_copy_fun_t(NULL, src);