Fix the fix. Plus killed some compile warnings.

1 files changed, 3 insertions, 11 deletions

diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index bdd73c9b6a..e05ebd5d42 100644
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -108,20 +108,13 @@ static void phpi_FDFClose(zend_rsrc_list_entry *rsrc)
 	(void)FDFClose(fdf);
 }
 
-static sapi_post_entry supported_post_entries[] = {
-#if HAVE_FDFLIB
-	{ "application/vnd.fdf",	sizeof("application/vnd.fdf")-1,	php_default_post_reader, fdf_post_handler},
-#endif
-	{ NULL, 0, NULL }
-};
-
 #define FDF_POST_CONTENT_TYPE	"application/vnd.fdf"
 
 static sapi_post_entry php_fdf_post_entry =	{
 	FDF_POST_CONTENT_TYPE,
 	sizeof(FDF_POST_CONTENT_TYPE)-1,
 	sapi_read_standard_form_data,
-	php_std_post_handler
+	fdf_post_handler
 };
 
 
@@ -185,7 +178,7 @@ PHP_MSHUTDOWN_FUNCTION(fdf)
 	FDFErc err;
 
 	/* remove handler for Acrobat FDF form post requests */
-	sapi_remove_post_entry("application/vnd.fdf"); 
+	sapi_unregister_post_entry(&php_fdf_post_entry); 
 
 #ifdef PHP_WIN32
 	return SUCCESS;
@@ -778,10 +771,9 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler)
 	char *name=NULL,*value=NULL,*p;
 	int name_len=0,value_len=0;
 	char *lastfieldname =NULL;
-	char *strtok_buf = NULL;
 	char *filename = NULL;
 	FDFErc err;
-	ASInt32 nBytes, datalen;
+	ASInt32 nBytes;
 	zval *array_ptr = (zval *) arg;
 	ELS_FETCH();
 	PLS_FETCH();