cvs: /php4/ext/sybase sybase-ct.c
| From: | Sascha Schumann | Date: | Wed, 21 Jul 1999 08:55:19 +0000 |
| Subject: | cvs: /php4/ext/sybase sybase-ct.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-2403@lists.php.net to get a copy of this message | ||
sas Wed Jul 21 04:55:19 1999 EDT
Modified files:
/php4/ext/sybase sybase-ct.c
Log:
fix for #1748
Index: php4/ext/sybase/sybase-ct.c
diff -u php4/ext/sybase/sybase-ct.c:1.6 php4/ext/sybase/sybase-ct.c:1.7
--- php4/ext/sybase/sybase-ct.c:1.6 Fri Jul 16 18:00:50 1999
+++ php4/ext/sybase/sybase-ct.c Wed Jul 21 04:55:19 1999
@@ -17,12 +17,9 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sybase-ct.c,v 1.6 1999/07/16 22:00:50 zeev Exp $ */
+/* $Id: sybase-ct.c,v 1.7 1999/07/21 08:55:19 sas Exp $ */
-#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 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 @@
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++;
}