diff options
| author | SVN Migration <svn@php.net> | 1999-07-23 14:14:44 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 1999-07-23 14:14:44 +0000 |
| commit | 5cb21cbfef2dcdf31ac914920427d3d190c6ed26 (patch) | |
| tree | a6ea5826ba1eda810e9580a335798c020dfaeb9a /ext/sybase | |
| parent | b1617d8ac3bad1ace92085194e24cff8cbdbaf31 (diff) | |
| download | php-git-php-4.0b1.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_4_0b1'.php-4.0b1
Diffstat (limited to 'ext/sybase')
| -rw-r--r-- | ext/sybase/sybase-ct.c | 12 | ||||
| -rw-r--r-- | ext/sybase/sybase.c | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ext/sybase/sybase-ct.c b/ext/sybase/sybase-ct.c index aa1d992dae..cf50de9f29 100644 --- a/ext/sybase/sybase-ct.c +++ b/ext/sybase/sybase-ct.c @@ -20,6 +20,9 @@ /* $Id$ */ +#ifndef MSVC5 +#include "php_config.h" +#endif #include "php.h" #include "php3_sybase-ct.h" #include "ext/standard/php3_standard.h" @@ -602,8 +605,11 @@ 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 */ - ht = 0; - php3_sybct_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + HashTable dummy; + + _php3_hash_init(&dummy,0,NULL,NULL,0); + php3_sybct_do_connect(&dummy,return_value,list,plist,0); + _php3_hash_destroy(&dummy); } return php3_sybct_module.default_link; } @@ -1309,7 +1315,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++; } diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c index 0b50958ee8..760335d21e 100644 --- a/ext/sybase/sybase.c +++ b/ext/sybase/sybase.c @@ -473,7 +473,8 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) static int php3_sybase_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { if (php3_sybase_module.default_link==-1) { /* no link opened yet, implicitly open one */ - ht = 0; + int ht; + php3_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); } return php3_sybase_module.default_link; |