cvs: php4 /ext/domxml php_domxml.c php_domxml.h

mfischer Sun Dec 2 07:21:50 2001 EDT Modified files: /php4/ext/domxml php_domxml.c php_domxml.h Log: - Reverted macro moving stupidity (thx to Sterling). Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.82 php4/ext/domxml/php_domxml.c:1.83 --- php4/ext/domxml/php_domxml.c:1.82 Sun Dec 2 05:00:15 2001 +++ php4/ext/domxml/php_domxml.c Sun Dec 2 07:21:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.82 2001/12/02 10:00:15 eschmid Exp $ */ +/* $Id: php_domxml.c,v 1.83 2001/12/02 12:21:49 mfischer Exp $ */ #ifdef HAVE_CONFIG_H @@ -30,6 +30,45 @@ #include "ext/standard/info.h" #define PHP_XPATH 1 #define PHP_XPTR 2 + +/* General macros used by domxml */ +#define DOMXML_DOMOBJ_NEW(zval, obj, ret) if (NULL == (zval = php_domobject_new(obj, ret TSRMLS_CC))) { \ + php_error(E_WARNING, "%s() cannot create required DOM object", \ + get_active_function_name(TSRMLS_C)); \ + RETURN_FALSE; \ + } + +#define DOMXML_RET_ZVAL(zval) SEPARATE_ZVAL(&zval); \ + *return_value = *zval; \ + FREE_ZVAL(zval); + +#define DOMXML_RET_OBJ(zval, obj, ret) DOMXML_DOMOBJ_NEW(zval, obj, ret); \ + DOMXML_RET_ZVAL(zval); + +#define DOMXML_GET_THIS(zval) if (NULL == (zval = getThis())) { \ + php_error(E_WARNING, "%s() underlying object missing", \ + get_active_function_name(TSRMLS_C)); \ + RETURN_FALSE; \ + } + +#define DOMXML_GET_OBJ(ret, zval, le) if (NULL == (ret = php_dom_get_object(zval, le, 0 TSRMLS_CC))) { \ + php_error(E_WARNING, "%s() cannot fetch DOM object", \ + get_active_function_name(TSRMLS_C)); \ + RETURN_FALSE; \ + } + +#define DOMXML_GET_THIS_OBJ(ret, zval, le) DOMXML_GET_THIS(zval); \ + DOMXML_GET_OBJ(ret, zval, le); + +#define DOMXML_NO_ARGS() if (ZEND_NUM_ARGS() != 0) { \ + php_error(E_WARNING, "%s() expects exactly 0 parameters, %d given", \ + get_active_function_name(TSRMLS_C), ZEND_NUM_ARGS()); \ + return; \ + } + +#define DOMXML_NOT_IMPLEMENTED() php_error(E_WARNING, "%s() not yet implemented", \ + get_active_function_name(TSRMLS_C)); \ + return; static int le_domxmldocp; static int le_domxmldoctypep; Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.28 php4/ext/domxml/php_domxml.h:1.29 --- php4/ext/domxml/php_domxml.h:1.28 Sat Dec 1 14:42:34 2001 +++ php4/ext/domxml/php_domxml.h Sun Dec 2 07:21:50 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.h,v 1.28 2001/12/01 19:42:34 mfischer Exp $ */ +/* $Id: php_domxml.h,v 1.29 2001/12/02 12:21:50 mfischer Exp $ */ #ifndef PHP_DOMXML_H #define PHP_DOMXML_H @@ -141,45 +141,6 @@ PHP_FUNCTION(xptr_eval); #endif PHP_FUNCTION(domxml_test); - -/* General macros used by domxml */ -#define DOMXML_DOMOBJ_NEW(zval, obj, ret) if (NULL == (zval = php_domobject_new(obj, ret TSRMLS_CC))) { \ - php_error(E_WARNING, "%s() cannot create required DOM object", \ - get_active_function_name(TSRMLS_C)); \ - RETURN_FALSE; \ - } - -#define DOMXML_RET_ZVAL(zval) SEPARATE_ZVAL(&zval); \ - *return_value = *zval; \ - FREE_ZVAL(zval); - -#define DOMXML_RET_OBJ(zval, obj, ret) DOMXML_DOMOBJ_NEW(zval, obj, ret); \ - DOMXML_RET_ZVAL(zval); - -#define DOMXML_GET_THIS(zval) if (NULL == (zval = getThis())) { \ - php_error(E_WARNING, "%s() underlying object missing", \ - get_active_function_name(TSRMLS_C)); \ - RETURN_FALSE; \ - } - -#define DOMXML_GET_OBJ(ret, zval, le) if (NULL == (ret = php_dom_get_object(zval, le, 0 TSRMLS_CC))) { \ - php_error(E_WARNING, "%s() cannot fetch DOM object", \ - get_active_function_name(TSRMLS_C)); \ - RETURN_FALSE; \ - } - -#define DOMXML_GET_THIS_OBJ(ret, zval, le) DOMXML_GET_THIS(zval); \ - DOMXML_GET_OBJ(ret, zval, le); - -#define DOMXML_NO_ARGS() if (ZEND_NUM_ARGS() != 0) { \ - php_error(E_WARNING, "%s() expects exactly 0 parameters, %d given", \ - get_active_function_name(TSRMLS_C), ZEND_NUM_ARGS()); \ - return; \ - } - -#define DOMXML_NOT_IMPLEMENTED() php_error(E_WARNING, "%s() not yet implemented", \ - get_active_function_name(TSRMLS_C)); \ - return; #else #define domxml_module_ptr NULL