cvs: php4 /ext/fdf fdf.c
| From: | Jani Taskinen | Date: | Mon, 10 Mar 2003 02:14:09 +0000 |
| Subject: | cvs: php4 /ext/fdf fdf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19477@lists.php.net to get a copy of this message | ||
sniper Sun Mar 9 21:14:09 2003 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
cs & ws fixes
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.73 php4/ext/fdf/fdf.c:1.74
--- php4/ext/fdf/fdf.c:1.73 Thu Mar 6 18:07:23 2003
+++ php4/ext/fdf/fdf.c Sun Mar 9 21:14:09 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.73 2003/03/06 23:07:23 ddhill Exp $ */
+/* $Id: fdf.c,v 1.74 2003/03/10 02:14:09 sniper Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html.
*/
@@ -1478,49 +1478,50 @@
#endif
/* {{{ enum_values_callback */
- static ASBool enum_values_callback(char *name, char *value, void *userdata) {
- zval *retval_ptr, *z_name, *z_value, **args[3];
- long retval = 0;
- int numargs = 2;
- TSRMLS_FETCH();
-
- MAKE_STD_ZVAL(z_name);
- ZVAL_STRING(z_name, name, 1);
- args[0] = &z_name;
-
- if(*value) { // simple value
- MAKE_STD_ZVAL(z_value);
- ZVAL_STRING(z_value, value, 1);
- args[1] = &z_value;
- } else { // empty value *might* be an array
- // todo do it like fdf_get_value (or re-implement yourself?)
- }
-
- if(userdata) {
- args[2] = (zval **)userdata;
- numargs++;
- }
+static ASBool enum_values_callback(char *name, char *value, void *userdata)
+{
+ zval *retval_ptr, *z_name, *z_value, **args[3];
+ long retval = 0;
+ int numargs = 2;
+ TSRMLS_FETCH();
+
+ MAKE_STD_ZVAL(z_name);
+ ZVAL_STRING(z_name, name, 1);
+ args[0] = &z_name;
+
+ if (*value) { /* simple value */
+ MAKE_STD_ZVAL(z_value);
+ ZVAL_STRING(z_value, value, 1);
+ args[1] = &z_value;
+ } else { /* empty value *might* be an array */
+ /* TODO: do it like fdf_get_value (or re-implement yourself?) */
+ }
+
+ if (userdata) {
+ args[2] = (zval **) userdata;
+ numargs++;
+ }
- if (call_user_function_ex(EG(function_table),
+ if (call_user_function_ex(EG(function_table),
NULL,
FDF_G(enum_callback),
&retval_ptr,
numargs, args,
- 0, NULL TSRMLS_CC)==SUCCESS
- && retval_ptr) {
-
- convert_to_long_ex(&retval_ptr);
- retval = Z_LVAL_P(retval_ptr);
- zval_ptr_dtor(&retval_ptr);
- } else {
+ 0, NULL TSRMLS_CC) == SUCCESS
+ && retval_ptr) {
+
+ convert_to_long_ex(&retval_ptr);
+ retval = Z_LVAL_P(retval_ptr);
+ zval_ptr_dtor(&retval_ptr);
+ } else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "callback failed");
- }
+ }
- zval_ptr_dtor(&z_name);
- zval_ptr_dtor(&z_value);
+ zval_ptr_dtor(&z_name);
+ zval_ptr_dtor(&z_value);
- return retval;
- }
+ return retval;
+}
/* }}} */
/* {{{ proto bool fdf_enum_values(resource fdfdoc, callback function [, mixed userdata])