From: Frank M. Kromann <fmk@php.net>
Date: Wed, 14 Apr 2004 19:01:45 +0000 (+0000)
Subject: Declare variables before calling functions. This makes tidy compile on Win32.
X-Git-Tag: php-5.0.0RC2RC2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ba2e4bc51656cd7e0da2af07f87cda106bf5542;p=php

Declare variables before calling functions. This makes tidy compile on Win32.
---

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 844e3cbe38..a3468de1b5 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -55,8 +55,8 @@
     object = TG(inst)
    
 #define TIDY_FETCH_OBJECT	\
-	TIDY_SET_CONTEXT; \
 	PHPTidyObj *obj;	\
+	TIDY_SET_CONTEXT; \
 	if (object) {	\
 		if (ZEND_NUM_ARGS()) {	\
 			WRONG_PARAM_COUNT;	\
@@ -69,8 +69,8 @@
 	obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);	\
 
 #define TIDY_FETCH_ONLY_OBJECT	\
-	TIDY_SET_CONTEXT; \
 	PHPTidyObj *obj;	\
+	TIDY_SET_CONTEXT; \
 	if (ZEND_NUM_ARGS()) {	\
 		WRONG_PARAM_COUNT;	\
 	}	\
@@ -1274,15 +1274,14 @@ PHP_FUNCTION(tidy_config_count)
 /* {{{ proto mixed tidy_getopt(string option)
    Returns the value of the specified configuration option for the tidy document. */
 PHP_FUNCTION(tidy_getopt)
-{
-	TIDY_SET_CONTEXT;
-    
+{  
 	PHPTidyObj *obj;
 	char *optname;
 	void *optval;
 	int optname_len;
 	TidyOption opt;
 	TidyOptionType optt;
+	TIDY_SET_CONTEXT;
 
 	if (object) {
 		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &optname, &optname_len) == FAILURE) {
@@ -1337,9 +1336,8 @@ TIDY_DOC_METHOD(__construct)
 	char *contents;
 	zval *options = NULL;
 	
-    TIDY_SET_CONTEXT;
-	
 	PHPTidyObj *obj;
+    TIDY_SET_CONTEXT;	
 	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|szsb", &inputfile, &input_len,
 							  &options, &enc, &enc_len, &use_include_path) == FAILURE) {