fix for php#1748

Sascha Schumann · Sascha Schumann · commit a7e3a952e7c4 · 1999-07-21T08:55:20.000Z
diff --git a/ext/sybase/sybase-ct.c b/ext/sybase/sybase-ct.c
@@ -20,9 +20,6 @@
 /* $Id$ */
 
 
-#ifndef MSVC5
-#include "php_config.h"
-#endif
 #include "php.h"
 #include "php3_sybase-ct.h"
 #include "ext/standard/php3_standard.h"
@@ -605,11 +602,7 @@ static void php3_sybct_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 static int php3_sybct_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
 {
 	if (php3_sybct_module.default_link==-1) { /* no link opened yet, implicitly open one */
-		HashTable dummy;
-
-		_php3_hash_init(&dummy,0,NULL,NULL,0);
-		php3_sybct_do_connect(&dummy,return_value,list,plist,0);
-		_php3_hash_destroy(&dummy);
+		php3_sybct_do_connect(0,return_value,list,plist,0);
 	}
 	return php3_sybct_module.default_link;
 }
@@ -1315,7 +1308,7 @@ static PHP_FUNCTION(sybct_fetch_hash)
 			tmp->value.str.val = _php3_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1);
 		}
 		_php3_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL);
-		_php3_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &tmp, sizeof(pval *) NULL);
+		_php3_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &tmp, sizeof(pval *), NULL);
 	}
 	result->cur_row++;
 }

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@`
`20`	`20`	`/* $Id$ */`
`21`	`21`
`22`	`22`
`23`		`-#ifndef MSVC5`
`24`		`-#include "php_config.h"`
`25`		`-#endif`
`26`	`23`	`#include "php.h"`
`27`	`24`	`#include "php3_sybase-ct.h"`
`28`	`25`	`#include "ext/standard/php3_standard.h"`
`@@ -605,11 +602,7 @@ static void php3_sybct_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)`
`605`	`602`	`static int php3_sybct_get_default_link(INTERNAL_FUNCTION_PARAMETERS)`
`606`	`603`	`{`
`607`	`604`	`if (php3_sybct_module.default_link==-1) { /* no link opened yet, implicitly open one */`
`608`		`- HashTable dummy;`
`609`		`-`
`610`		`- _php3_hash_init(&dummy,0,NULL,NULL,0);`
`611`		`- php3_sybct_do_connect(&dummy,return_value,list,plist,0);`
`612`		`- _php3_hash_destroy(&dummy);`
	`605`	`+ php3_sybct_do_connect(0,return_value,list,plist,0);`
`613`	`606`	`}`
`614`	`607`	`return php3_sybct_module.default_link;`
`615`	`608`	`}`
`@@ -1315,7 +1308,7 @@ static PHP_FUNCTION(sybct_fetch_hash)`
`1315`	`1308`	`tmp->value.str.val = _php3_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1);`
`1316`	`1309`	`}`
`1317`	`1310`	`_php3_hash_index_update(return_value->value.ht, i, (void ) &tmp, sizeof(pval ), NULL);`
`1318`		`- _php3_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void ) &tmp, sizeof(pval ) NULL);`
	`1311`	`+ _php3_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void ) &tmp, sizeof(pval ), NULL);`
`1319`	`1312`	`}`
`1320`	`1313`	`result->cur_row++;`
`1321`	`1314`	`}`