From 9fbd0a24ba7a0e4e5f31799c787a65212f1c2652 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sat, 16 Dec 2000 21:01:21 +0000 Subject: [PATCH] - How did CVS let me commit this? Probably it confused with the branch merge --- ext/dba/dba.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 053861aadc..c432b70018 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -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(); -- 2.50.1