cvs: php4 /ext/dba dba.c

From: Date: Sat, 16 Dec 2000 21:01:21 +0000
Subject: cvs: php4 /ext/dba dba.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-3190@lists.php.net to get a copy of this message
andi Sat Dec 16 13:01:21 2000 EDT Modified files: /php4/ext/dba dba.c Log: - How did CVS let me commit this? Probably it confused with the branch merge Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.30 php4/ext/dba/dba.c:1.31 --- php4/ext/dba/dba.c:1.30 Sat Dec 16 12:52:42 2000 +++ php4/ext/dba/dba.c Sat Dec 16 13:01:21 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.30 2000/12/16 20:52:42 andi Exp $ */ +/* $Id: dba.c,v 1.31 2000/12/16 21:01:21 andi Exp $ */ #include "php.h" @@ -211,21 +211,11 @@ 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();

« previous php.cvs (#3190) next »