cvs: php4 /ext/fdf fdf.c

hholzgra Fri May 9 03:55:32 2003 EDT Modified files: /php4/ext/fdf fdf.c Log: no more VC++ compile warnings Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.75 php4/ext/fdf/fdf.c:1.76 --- php4/ext/fdf/fdf.c:1.75 Mon Mar 17 07:59:20 2003 +++ php4/ext/fdf/fdf.c Fri May 9 03:55:32 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.75 2003/03/17 12:59:20 hholzgra Exp $ */ +/* $Id: fdf.c,v 1.76 2003/05/09 07:55:32 hholzgra Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -129,8 +129,6 @@ */ PHP_MINIT_FUNCTION(fdf) { - FDFErc err; - le_fdf = zend_register_list_destructors_ex(phpi_FDFClose, NULL, "fdf", module_number); /* add handler for Acrobat FDF form post requests */ @@ -172,9 +170,9 @@ #ifdef PHP_WIN32 return SUCCESS; +#else + return (FDFInitialize() == FDFErcOK) ? SUCCESS : FAILURE; #endif - if((err = FDFInitialize()) == FDFErcOK) return SUCCESS; - return FAILURE; } /* }}} */ @@ -201,16 +199,14 @@ */ PHP_MSHUTDOWN_FUNCTION(fdf) { - FDFErc err; - /* remove handler for Acrobat FDF form post requests */ sapi_unregister_post_entry(&php_fdf_post_entry); #ifdef PHP_WIN32 return SUCCESS; +#else + return (FDFFinalize() == FDFErcOK) ? SUCCESS : FAILURE; #endif - if((err = FDFFinalize()) == FDFErcOK) return SUCCESS; - return FAILURE; } /* }}} */ @@ -898,7 +894,7 @@ filespec.ID[1] = NULL; filespec.bVolatile = false; - err = FDFAddTemplate(fdf, Z_LVAL_PP(newpage), &filespec, Z_STRVAL_PP(template), Z_LVAL_PP(rename)); + err = FDFAddTemplate(fdf, (unsigned short)(Z_LVAL_PP(newpage)), &filespec, Z_STRVAL_PP(template), (unsigned short)(Z_LVAL_PP(rename))); if(err != FDFErcOK) { FDF_FAILURE(err); } @@ -1520,7 +1516,7 @@ zval_ptr_dtor(&z_name); zval_ptr_dtor(&z_value); - return retval; + return (ASBool)retval; } /* }}} */