mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

- How did CVS let me commit this? Probably it confused with the branch

Browse Source 
merge
This commit is contained in:
Andi Gutmans 2000-12-16 21:01:21 +00:00
parent 8518010945
commit 9fbd0a24ba
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/dba/dba.c
View File

@ -211,21 +211,11 @@ static PHP_MSHUTDOWN_FUNCTION(dba)
static PHP_MINFO_FUNCTION(dba)
{
dba_handler *hptr;
<<<<<<< dba.c
static char handlers[80];
=======
smart_str handlers = {0};
>>>>>>> 1.28
handlers[0] = '\0';
for(hptr = handler; hptr->name; hptr++) {
<<<<<<< dba.c
strlcat(handlers, hptr->name, sizeof(handlers));
=======
smart_str_appends(&handlers, hptr->name);
smart_str_appendc(&handlers, ' ');
>>>>>>> 1.28
}
php_info_print_table_start();