cvs: /php4 build-defs.h.in configure.in php.h win95nt.h /php4/dl/log log_sql.c /php4/ext/cybercash cybercash.h /php4/ext/db db.c /php4/ext/dbase
dbf_ndx.c /php4/ext/gettext php_gettext.h /php4/ext/icap php_icap.c /php4/ext/imap imap.c /php4/ext/mcal php_mcal.c /php4/ext/mcrypt php_mcrypt.h
/php4/ext/mhash php_mhash.h /php4/ext/odbc php_odbc.c /php4/ext/standard dns.c

andi Sat Mar 11 12:48:51 2000 EDT Modified files: /php4 build-defs.h.in configure.in php.h win95nt.h /php4/dl/log log_sql.c /php4/ext/cybercash cybercash.h /php4/ext/db db.c /php4/ext/dbase dbf_ndx.c /php4/ext/gettext php_gettext.h /php4/ext/icap php_icap.c /php4/ext/imap imap.c /php4/ext/mcal php_mcal.c /php4/ext/mcrypt php_mcrypt.h /php4/ext/mhash php_mhash.h /php4/ext/odbc php_odbc.c /php4/ext/standard dns.c Log: - Don't define DEBUG anymore. Everyone should use PHP_DEBUG. There are 2-3 third-party libs in PHP which use DEBUG and I left them this way (primary example is pcrelib). - Please test things and Andrei, can you check that pcrelib stopped printing the warning messages? Index: php4/build-defs.h.in diff -u php4/build-defs.h.in:1.9 php4/build-defs.h.in:1.10 --- php4/build-defs.h.in:1.9 Tue Dec 21 14:57:54 1999 +++ php4/build-defs.h.in Sat Mar 11 12:48:44 2000 @@ -39,7 +39,7 @@ #define PHP_BINNAME "@BINNAME@" #define PHP_CFLAGS "@CFLAGS@" #define PHP_DBASE_LIB "" -#define PHP_DEBUG "@DEBUG_CFLAGS@" +#define PHP_BUILD_DEBUG "@DEBUG_CFLAGS@" #define PHP_GDBM_INCLUDE "" #define PHP_HSREGEX "" #define PHP_IBASE_INCLUDE "" Index: php4/configure.in diff -u php4/configure.in:1.102 php4/configure.in:1.103 --- php4/configure.in:1.102 Sat Mar 11 03:36:46 2000 +++ php4/configure.in Sat Mar 11 12:48:44 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.102 2000/03/11 11:36:46 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.103 2000/03/11 20:48:44 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -406,11 +406,9 @@ AC_MSG_RESULT($PHP_DEBUG) if test "$PHP_DEBUG" = "yes"; then - AC_DEFINE(DEBUG,1) PHP_DEBUG=1 ZEND_DEBUG=yes else - AC_DEFINE(DEBUG,0) PHP_DEBUG=0 ZEND_DEBUG=no fi Index: php4/php.h diff -u php4/php.h:1.68 php4/php.h:1.69 --- php4/php.h:1.68 Mon Mar 6 12:37:11 2000 +++ php4/php.h Sat Mar 11 12:48:44 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.68 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: php.h,v 1.69 2000/03/11 20:48:44 andi Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -73,11 +73,11 @@ #include "php_regex.h" /* PHP's DEBUG value must match Zend's ZEND_DEBUG value */ -#undef DEBUG -#define DEBUG ZEND_DEBUG +#undef PHP_DEBUG +#define PHP_DEBUG ZEND_DEBUG -#if DEBUG || !(defined(__GNUC__)||defined(PHP_WIN32)) +#if PHP_DEBUG || !(defined(__GNUC__)||defined(PHP_WIN32)) #ifdef inline #undef inline #endif Index: php4/win95nt.h diff -u php4/win95nt.h:1.6 php4/win95nt.h:1.7 --- php4/win95nt.h:1.6 Sun Mar 5 15:59:56 2000 +++ php4/win95nt.h Sat Mar 11 12:48:44 2000 @@ -44,7 +44,7 @@ #define M_PI_2 1.57079632679489661923 #define M_PI_4 0.78539816339744830962 -#if !DEBUG +#if !PHP_DEBUG #ifdef inline #undef inline #endif Index: php4/dl/log/log_sql.c diff -u php4/dl/log/log_sql.c:1.2 php4/dl/log/log_sql.c:1.3 --- php4/dl/log/log_sql.c:1.2 Mon Aug 2 12:16:38 1999 +++ php4/dl/log/log_sql.c Sat Mar 11 12:48:44 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: log_sql.c,v 1.2 1999/08/02 19:16:38 zeev Exp $ */ +/* $Id: log_sql.c,v 1.3 2000/03/11 20:48:44 andi Exp $ */ #include "phpdl.h" @@ -85,7 +85,7 @@ #endif char hs=0,es=0,ls=0,bs=0; -#if DEBUG +#if PHP_DEBUG Debug("SQLLog called for file: [%s]\n",filename?filename:"null"); #endif @@ -186,7 +186,7 @@ } sprintf(query,"insert into log%ld values (%ld,'%s','%s','%s','%s','%s')", uid,t,fn,host?host:"",email?email:"",lref?lref:"",browser?browser:""); -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif #if MSQLLOGGING @@ -194,7 +194,7 @@ #endif #if MYSQLLOGGING if (mysql_query(dbsock,query)<0) { -#if DEBUG +#if PHP_DEBUG Debug("Query failed! (%s)\n",mysql_error(mysql)); #endif #endif @@ -216,17 +216,17 @@ #endif #endif } -#if DEBUG +#if PHP_DEBUG else { Debug("Lock failed\n"); } #endif -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif if (msqlQuery(dbsock,query)<0) { -#if DEBUG +#if PHP_DEBUG Debug("Query failed! (%s)\n",msqlErrMsg); #endif } else { @@ -250,11 +250,11 @@ la = 0; sprintf(query,"insert into last%ld values ('%s',%ld,0,0,%ld,'%s','%s','%s','%s')", uid,fn,t,t,host?host:"",email?email:"",lref?lref:"",browser?browser:""); -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif if (msqlQuery(dbsock,query)<0) { -#if DEBUG +#if PHP_DEBUG Debug("Query failed! (%s)\n",msqlErrMsg); #endif } @@ -263,11 +263,11 @@ #endif #if MYSQLLOGGING sprintf(query,"select total,today,timestmp from last%ld where filename='%s'",uid,fn); -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif if (mysql_query(dbsock,query)<0){ -#if DEBUG +#if PHP_DEBUG Debug("Query failed! (%s)\n",mysql_error(mysql)); #endif } else { @@ -291,11 +291,11 @@ la = 0; sprintf(query,"insert into last%ld values ('%s',%ld,0,0,%ld,'%s','%s','%s','%s')", uid,fn,t,t,host?host:"",email?email:"",lref?lref:"",browser?browser:""); -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif if (mysql_query(dbsock,query)<0) { -#if DEBUG +#if PHP_DEBUG Debug("Query failed! (%s)\n",mysql_error(mysql)); #endif } @@ -322,7 +322,7 @@ uid,t,total_count,today_count,host?host:"",email?email:"",lref?lref:"",browser?browser:"",fn); #endif -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif #if MSQLLOGGING @@ -330,7 +330,7 @@ #endif #if MYSQLLOGGING if (mysql_query(dbsock,query)<0) { -#if DEBUG +#if PHP_DEBUG Debug("Sending query: %s\n",query); #endif @@ -444,7 +444,7 @@ #endif sprintf(query,"select * from last%ld where filename='%s'",uid,lfn); -#if DEBUG +#if PHP_DEBUG Debug("sqlloadlastinfo: Sending query: %s\n",query); #endif #if MSQLLOGGING @@ -453,7 +453,7 @@ #if MYSQLLOGGING if (mysql_query(dbsock,query)<0) { #endif -#if DEBUG +#if PHP_DEBUG #if MSQLLOGGING Debug("Query failed! (%s)\n",msqlErrMsg); #endif Index: php4/ext/cybercash/cybercash.h diff -u php4/ext/cybercash/cybercash.h:1.1 php4/ext/cybercash/cybercash.h:1.2 --- php4/ext/cybercash/cybercash.h:1.1 Mon Dec 6 16:56:25 1999 +++ php4/ext/cybercash/cybercash.h Sat Mar 11 12:48:44 2000 @@ -35,7 +35,7 @@ #if PHP_API_VERSION < 19990421 #define zend_module_entry cybercash_module_entry -#include "modules.h" +#include "zend_modules.h" #include "internal_functions.h" #endif Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.25 php4/ext/db/db.c:1.26 --- php4/ext/db/db.c:1.25 Mon Mar 6 10:41:05 2000 +++ php4/ext/db/db.c Sat Mar 11 12:48:44 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.25 2000/03/06 18:41:05 ssb Exp $ */ +/* $Id: db.c,v 1.26 2000/03/11 20:48:44 andi Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -373,13 +373,13 @@ ret = -1; #else #if NDBM -#if DEBUG +#if PHP_DEBUG php_error(E_WARNING, "dbmopen_ndbm(%s): errno = %d [%s]\n",filename,errno,strerror(errno)); #endif if (errno) ret=errno; else ret = -1; #else -#if DEBUG +#if PHP_DEBUG php_error(E_WARNING, "dbmopen_flatfile(%s): errno = %d [%s]\n",filename,errno,strerror(errno)); #endif if (errno) ret=errno; Index: php4/ext/dbase/dbf_ndx.c diff -u php4/ext/dbase/dbf_ndx.c:1.1 php4/ext/dbase/dbf_ndx.c:1.2 --- php4/ext/dbase/dbf_ndx.c:1.1 Mon Apr 19 06:56:50 1999 +++ php4/ext/dbase/dbf_ndx.c Sat Mar 11 12:48:45 2000 @@ -50,7 +50,7 @@ dndx_page_t *dp; ndx_record_t *rp; -#if DEBUG +#if PHP_DEBUG printf("getting page %d", pageno); #endif if ((fp = (ndx_page_t *)malloc(sizeof(ndx_page_t))) == NULL) @@ -75,7 +75,7 @@ memset(rp, 0, sizeof(ndx_record_t) * hp->ndx_keys_ppg); fp->ndxp_records = rp; fp->ndxp_header_p = hp; -#if DEBUG +#if PHP_DEBUG printf(", n_keys %ld\n", fp->ndxp_num_keys); #endif return fp; @@ -102,7 +102,7 @@ ndx_header_t *hp = fp->ndxp_header_p; struct dndx_record *drp; -#if DEBUG +#if PHP_DEBUG printf("page %ld, rec %d: ", fp->ndxp_page_no, rec_no); #endif if (rec_no >= fp->ndxp_num_keys) @@ -117,7 +117,7 @@ rp->ndxr_key_data = &drp->dndx_key_data; rp->ndxr_p_nrec = rec_no; } -#if DEBUG +#if PHP_DEBUG printf("left %ld, dbf_rec %ld, data '%s'\n", rp->ndxr_left, rp->ndxr_rec, rp->ndxr_key_data); #endif Index: php4/ext/gettext/php_gettext.h diff -u php4/ext/gettext/php_gettext.h:1.3 php4/ext/gettext/php_gettext.h:1.4 --- php4/ext/gettext/php_gettext.h:1.3 Fri Dec 17 13:50:03 1999 +++ php4/ext/gettext/php_gettext.h Sat Mar 11 12:48:45 2000 @@ -27,14 +27,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gettext.h,v 1.3 1999/12/17 21:50:03 zeev Exp $ */ +/* $Id: php_gettext.h,v 1.4 2000/03/11 20:48:45 andi Exp $ */ #ifndef _GETTEXT_H #define _GETTEXT_H #if HAVE_LIBINTL #ifndef INIT_FUNC_ARGS -#include "modules.h" +#include "zend_modules.h" #endif extern zend_module_entry php_gettext_module_entry; Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.4 php4/ext/icap/php_icap.c:1.5 --- php4/ext/icap/php_icap.c:1.4 Mon Mar 6 10:41:07 2000 +++ php4/ext/icap/php_icap.c Sat Mar 11 12:48:46 2000 @@ -49,7 +49,7 @@ #include <stdarg.h> #include "cal.h" #include "php_icap.h" -#include "modules.h" +#include "zend_modules.h" #if (WIN32|WINNT) #include "winsock.h" #endif Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.49 php4/ext/imap/imap.c:1.50 --- php4/ext/imap/imap.c:1.49 Mon Mar 6 10:41:08 2000 +++ php4/ext/imap/imap.c Sat Mar 11 12:48:46 2000 @@ -22,7 +22,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.49 2000/03/06 18:41:08 ssb Exp $ */ +/* $Id: imap.c,v 1.50 2000/03/11 20:48:46 andi Exp $ */ #define IMAP41 @@ -46,7 +46,7 @@ #include "imap.h" #include "mail.h" #include "rfc822.h" -#include "modules.h" +#include "zend_modules.h" #if (WIN32|WINNT) #include "winsock.h" MAILSTREAM DEFAULTPROTO; @@ -459,7 +459,7 @@ /* Open Options */ - REGISTER_MAIN_LONG_CONSTANT("OP_DEBUG", OP_DEBUG, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT("OP_PHP_DEBUG", OP_PHP_DEBUG, CONST_PERSISTENT | CONST_CS); /* debug protocol negotiations */ REGISTER_MAIN_LONG_CONSTANT("OP_READONLY", OP_READONLY, CONST_PERSISTENT | CONST_CS); @@ -2349,7 +2349,7 @@ *outp = 0; -#if DEBUG +#if PHP_DEBUG /* warn if we computed outlen incorrectly */ if (outp - out != outlen) { php_error(E_WARNING, @@ -2476,7 +2476,7 @@ *outp = 0; -#if DEBUG +#if PHP_DEBUG /* warn if we computed outlen incorrectly */ if (outp - out != outlen) { php_error(E_WARNING, Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.13 php4/ext/mcal/php_mcal.c:1.14 --- php4/ext/mcal/php_mcal.c:1.13 Fri Mar 10 21:40:21 2000 +++ php4/ext/mcal/php_mcal.c Sat Mar 11 12:48:47 2000 @@ -49,7 +49,7 @@ #include <stdarg.h> #include "mcal.h" #include "php_mcal.h" -#include "modules.h" +#include "zend_modules.h" #if (WIN32|WINNT) #include "winsock.h" #endif Index: php4/ext/mcrypt/php_mcrypt.h diff -u php4/ext/mcrypt/php_mcrypt.h:1.11 php4/ext/mcrypt/php_mcrypt.h:1.12 --- php4/ext/mcrypt/php_mcrypt.h:1.11 Fri Dec 17 12:55:10 1999 +++ php4/ext/mcrypt/php_mcrypt.h Sat Mar 11 12:48:48 2000 @@ -5,7 +5,7 @@ #if PHP_API_VERSION < 19990421 #define zend_module_entry zend_module_entry -#include "modules.h" +#include "zend_modules.h" #include "internal_functions.h" #endif Index: php4/ext/mhash/php_mhash.h diff -u php4/ext/mhash/php_mhash.h:1.3 php4/ext/mhash/php_mhash.h:1.4 --- php4/ext/mhash/php_mhash.h:1.3 Fri Dec 17 12:55:12 1999 +++ php4/ext/mhash/php_mhash.h Sat Mar 11 12:48:49 2000 @@ -5,7 +5,7 @@ #if PHP_API_VERSION < 19990421 #define zend_module_entry zend_module_entry -#include "modules.h" +#include "zend_modules.h" #include "internal_functions.h" #endif Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.33 php4/ext/odbc/php_odbc.c:1.34 --- php4/ext/odbc/php_odbc.c:1.33 Thu Mar 9 14:19:57 2000 +++ php4/ext/odbc/php_odbc.c Sat Mar 11 12:48:49 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.33 2000/03/09 22:19:57 codelion Exp $ */ +/* $Id: php_odbc.c,v 1.34 2000/03/11 20:48:49 andi Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -243,7 +243,7 @@ } if (value) { -#if DEBUG +#if PHP_DEBUG php_printf("%s", value); #else PUTS("********"); Index: php4/ext/standard/dns.c diff -u php4/ext/standard/dns.c:1.15 php4/ext/standard/dns.c:1.16 --- php4/ext/standard/dns.c:1.15 Sat Feb 19 15:41:20 2000 +++ php4/ext/standard/dns.c Sat Mar 11 12:48:49 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.15 2000/02/19 23:41:20 zeev Exp $ */ +/* $Id: dns.c,v 1.16 2000/03/11 20:48:49 andi Exp $ */ #include "php.h" #if HAVE_SYS_SOCKET_H @@ -75,14 +75,14 @@ struct hostent *hp; if ((int) (addr = inet_addr(ip)) == -1) { -#if DEBUG +#if PHP_DEBUG php_error(E_WARNING, "address not in a.b.c.d form"); #endif return estrdup(ip); } hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET); if (!hp) { -#if DEBUG +#if PHP_DEBUG php_error(E_WARNING, "Unable to resolve %s\n", ip); #endif return estrdup(ip); @@ -127,7 +127,7 @@ hp = gethostbyname((*arg)->value.str.val); if (hp == NULL || hp->h_addr_list == NULL) { -#if DEBUG +#if PHP_DEBUG php_error(E_WARNING, "Unable to resolve %s\n", (*arg)->value.str.val); #endif return; @@ -149,7 +149,7 @@ hp = gethostbyname(name); if (!hp || !hp->h_addr_list) { -#if DEBUG +#if PHP_DEBUG php_error(E_WARNING, "Unable to resolve %s\n", name); #endif return estrdup(name);