[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Tue Jan 14 20:34:31 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1235 php4/ChangeLog:1.1236 --- php4/ChangeLog:1.1235 Mon Jan 13 20:35:26 2003 +++ php4/ChangeLog Tue Jan 14 20:34:30 2003 @@ -1,3 +1,110 @@ +2003-01-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/rpc/xmlrpc/xmlrpc-epi-php.c: + Porting of patch applied to ext/xmlrpc. + +* ext/xmlrpc/xmlrpc-epi-php.c: + Made the code use php_error_docref(). + Removed pointless checks around array_init() and emalloc(). + Switched to zend_get_parameters_ex() argument parsing API. + +* ext/domxml/php_domxml.c: + Changed getParameters() to zend_get_parameters_ex(). + +* ext/hyperwave/hw.c: + Fixed compile warnings. + +* ext/cpdf/cpdf.c: + One more typo. + +* ext/cpdf/cpdf.c: + Fixed typos. + +2003-01-14 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/iconv/iconv.c: + Appended my name to the list of authors + +* ext/iconv/tests/iconv_mime_decode.phpt: + Test update for new feature + +2003-01-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/cpdf/cpdf.c: + Switched from old getParse* argument parsing API to a more recent + zend_get_parameters*. + +2003-01-14 Andrey Hristov [EMAIL PROTECTED] + +* ext/standard/basic_functions.c + ext/standard/php_var.h + ext/standard/var.c: + added function get_memory_usage(). available only when PHP is compiled + with --enable-memory-limit + +2003-01-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/hyperwave/hg_comm.c: + Fixed compile warning removed useless variable. + +* ext/hyperwave/hw.c: + Changed php_error to php_error_docref. + Got rid off the ancient getParameters* parameter parsing API. + +2003-01-14 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/standard/filters.c: + Added a new option force-encode-first to the quoted-printable encoder + as per Wez's request. If enabled, the encoder forcefully does qp + tranformation on every first character of lines in incoming stream. + +2003-01-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/cpdf/cpdf.c: + Changed php_error() to php_error_docref(). + Made pdfdoc retrieval a macro. + +2003-01-14 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/standard/quot_print.c: + Made php_quot_print_decode() RFC2045-compliant + +2003-01-14 Edin Kadribasic [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Bugfixing news + +* ext/gettext/gettext.dsp: + MFB: bind_textdomain_codeset() availability on windows + +* (PHP_4_3) + ext/gettext/gettext.dsp: + Made bind_textdomain_codeset() available on windows (fixes #21525). + +2003-01-14 Derick Rethans [EMAIL PROTECTED] + +* win32/install.txt: + s/gd/gd2 + +2003-01-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/sockets/sockets.c: + Changed php_error to php_error_docref(). + Removed pointless checks around array_init(). + +2003-01-14 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/standard/filters.c: + Fixed small memory leak that occurs when the invalid line length is passed + to the qprint ctor. + +* ext/standard/filters.c: + Fixed quoted-printable encoder so that it produces RFC2045 complicant + output. As per this specification requirement, the constructor now accepts + three options: binary (boolean), line-len (uint), line-break-chars + (string). + 2003-01-13 Jani Taskinen [EMAIL PROTECTED] * ext/informix/config.m4
[PHP-CVS-DAILY] cvs: Zend / ChangeLog
changelog Tue Jan 14 20:34:45 2003 EDT Modified files: /Zend ChangeLog Log: ChangeLog update Index: Zend/ChangeLog diff -u Zend/ChangeLog:1.106 Zend/ChangeLog:1.107 --- Zend/ChangeLog:1.106Mon Jan 13 20:35:41 2003 +++ Zend/ChangeLog Tue Jan 14 20:34:45 2003 @@ -1,3 +1,13 @@ +2003-01-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* zend_ini_parser.y: + Re-instating the patch, it was correct after all. + + +* zend_ini_parser.y + zend_ini_parser.y: + Reverting previous patch. + 2003-01-13 Ilia Alshanetsky [EMAIL PROTECTED] * zend_ini_parser.y: @@ -900,7 +910,7 @@ 2002-05-13 Sterling Hughes [EMAIL PROTECTED] -* zend_qsort.c: add $Id: ChangeLog,v 1.106 2003/01/14 01:35:41 changelog Exp $ tag +* zend_qsort.c: add $Id: ChangeLog,v 1.107 2003/01/15 01:34:45 changelog Exp $ tag 2002-05-13 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /win32 install.txt
derick Tue Jan 14 08:55:00 2003 EDT Modified files: /php4/win32 install.txt Log: s/gd/gd2 Index: php4/win32/install.txt diff -u php4/win32/install.txt:1.19 php4/win32/install.txt:1.20 --- php4/win32/install.txt:1.19 Mon Dec 30 09:08:25 2002 +++ php4/win32/install.txt Tue Jan 14 08:55:00 2003 @@ -186,7 +186,7 @@ php_dbase.dll dBase functions php_filepro.dll Read-only access to Filepro databases - php_gd.dllGD library functions for image manipulation + php_gd2.dll GD library functions for image manipulation php_hyperwave.dll HyperWave functions php_imap.dll IMAP functions php_ldap.dll LDAP functions -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gettext gettext.dsp
edink Tue Jan 14 09:45:17 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gettext gettext.dsp Log: Made bind_textdomain_codeset() available on windows (fixes #21525). Index: php4/ext/gettext/gettext.dsp diff -u php4/ext/gettext/gettext.dsp:1.1 php4/ext/gettext/gettext.dsp:1.1.16.1 --- php4/ext/gettext/gettext.dsp:1.1Wed Aug 23 12:00:38 2000 +++ php4/ext/gettext/gettext.dspTue Jan 14 09:45:16 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_GETTEXT /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D GETTEXT_EXPORTS /D COMPILE_DL_GETTEXT /D ZTS=1 /D HAVE_LIBINTL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D GETTEXT_EXPORTS /D +COMPILE_DL_GETTEXT /D ZTS=1 /D HAVE_LIBINTL=1 /D HAVE_BIND_TEXTDOMAIN_CODESET=1 /D +ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D +PHP_WIN32 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MSSQL_EXPORTS /D COMPILE_DL_GETTEXT /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D GETTEXT_EXPORTS /D COMPILE_DL_GETTEXT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBINTL=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D +_WINDOWS /D _MBCS /D _USRDLL /D GETTEXT_EXPORTS /D COMPILE_DL_GETTEXT /D +ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBINTL=1 /D +HAVE_BIND_TEXTDOMAIN_CODESET=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gettext gettext.dsp
edink Tue Jan 14 09:46:33 2003 EDT Modified files: /php4/ext/gettext gettext.dsp Log: MFB: bind_textdomain_codeset() availability on windows Index: php4/ext/gettext/gettext.dsp diff -u php4/ext/gettext/gettext.dsp:1.1 php4/ext/gettext/gettext.dsp:1.2 --- php4/ext/gettext/gettext.dsp:1.1Wed Aug 23 12:00:38 2000 +++ php4/ext/gettext/gettext.dspTue Jan 14 09:46:33 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_GETTEXT /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D GETTEXT_EXPORTS /D COMPILE_DL_GETTEXT /D ZTS=1 /D HAVE_LIBINTL=1 /D ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D GETTEXT_EXPORTS /D +COMPILE_DL_GETTEXT /D ZTS=1 /D HAVE_LIBINTL=1 /D HAVE_BIND_TEXTDOMAIN_CODESET=1 /D +ZEND_DEBUG=0 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D +PHP_WIN32 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MSSQL_EXPORTS /D COMPILE_DL_GETTEXT /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D GETTEXT_EXPORTS /D COMPILE_DL_GETTEXT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBINTL=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I +..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D +_WINDOWS /D _MBCS /D _USRDLL /D GETTEXT_EXPORTS /D COMPILE_DL_GETTEXT /D +ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBINTL=1 /D +HAVE_BIND_TEXTDOMAIN_CODESET=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
edink Tue Jan 14 09:49:42 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Bugfixing news Index: php4/NEWS diff -u php4/NEWS:1.1247.2.48 php4/NEWS:1.1247.2.49 --- php4/NEWS:1.1247.2.48 Thu Jan 9 20:17:03 2003 +++ php4/NEWS Tue Jan 14 09:49:41 2003 @@ -9,6 +9,7 @@ . Disallow linkage of Berkeley db submodules against libraries with different major version. . Disallow configuring of more than one Berkeley db handler. +- Fixed bug #21525 (bind_textdomain_codeset() now available on Windows). (Edin) - Fixed bug #21511 (config.status warning). (Jani) - Fixed bug #21531 (file_exists() and other filestat functions report errors when the requested file/directory does not exists). (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard quot_print.c
moriyoshi Tue Jan 14 10:14:11 2003 EDT
Modified files:
/php4/ext/standard quot_print.c
Log:
Made php_quot_print_decode() RFC2045-compliant
# this function is only used in iconv extension and the corresponding
# userland function doesn't use it, so I don't see any BC issue here.
Index: php4/ext/standard/quot_print.c
diff -u php4/ext/standard/quot_print.c:1.24 php4/ext/standard/quot_print.c:1.25
--- php4/ext/standard/quot_print.c:1.24 Mon Jan 6 10:47:25 2003
+++ php4/ext/standard/quot_print.c Tue Jan 14 10:14:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: quot_print.c,v 1.24 2003/01/06 15:47:25 moriyoshi Exp $ */
+/* $Id: quot_print.c,v 1.25 2003/01/14 15:14:11 moriyoshi Exp $ */
#include stdlib.h
@@ -57,60 +57,78 @@
register unsigned char *p2;
register unsigned int h_nbl, l_nbl;
- size_t decoded_len;
+ size_t decoded_len, buf_size;
unsigned char *retval;
static unsigned int hexval_tbl[256] = {
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 16, 16, 16, 16, 16,
- 16, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 32, 16, 64, 64, 16, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 32, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 64, 64, 64, 64, 64, 64,
+ 64, 10, 11, 12, 13, 14, 15, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
};
- i = length, p1 = str; decoded_len = length;
+ i = length, p1 = str; buf_size = length;
- while (i 0 *p1 != '\0') {
+ while (i 1 *p1 != '\0') {
if (*p1 == '=') {
- decoded_len -= 2;
- p1 += 2;
- i -= 2;
+ buf_size -= 2;
+ p1++;
+ i--;
}
p1++;
i--;
}
- retval = emalloc(decoded_len + 1);
+ retval = emalloc(buf_size + 1);
i = length; p1 = str; p2 = retval;
+ decoded_len = 0;
while (i 0 *p1 != '\0') {
if (*p1 == '=') {
- if (i 2 ||
- (h_nbl = hexval_tbl[p1[1]]) 15 ||
- (l_nbl = hexval_tbl[p1[2]]) 15) {
-
+ i--, p1++;
+ if (i == 0 || *p1 == '\0') {
+ break;
+ }
+ h_nbl = hexval_tbl[*p1];
+ if (h_nbl 16) {
+ /* next char should be a hexadecimal digit */
+ if ((--i) == 0 || (l_nbl = hexval_tbl[*(++p1)]) = 16)
+{
+
[PHP-CVS] cvs: php4 /ext/cpdf cpdf.c
iliaa Tue Jan 14 10:15:55 2003 EDT
Modified files:
/php4/ext/cpdf cpdf.c
Log:
Changed php_error() to php_error_docref().
Made pdfdoc retrieval a macro.
Index: php4/ext/cpdf/cpdf.c
diff -u php4/ext/cpdf/cpdf.c:1.45 php4/ext/cpdf/cpdf.c:1.46
--- php4/ext/cpdf/cpdf.c:1.45 Tue Dec 31 11:06:19 2002
+++ php4/ext/cpdf/cpdf.cTue Jan 14 10:15:53 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cpdf.c,v 1.45 2002/12/31 16:06:19 sebastian Exp $ */
+/* $Id: cpdf.c,v 1.46 2003/01/14 15:15:53 iliaa Exp $ */
/* cpdflib.h -- C language API definitions for ClibPDF library
* Copyright (C) 1998 FastIO Systems, All Rights Reserved.
*/
@@ -80,6 +80,15 @@
#endif
#endif
+#define CPDF_FETCH_CPDFDOC(pdf_zval) \
+convert_to_long(pdf_zval); \
+ id = Z_LVAL_P(pdf_zval); \
+ pdf = zend_list_find(id, type); \
+ if(!pdf || type != CPDF_GLOBAL(le_cpdf)) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find identifier
+%d, id); \
+ RETURN_FALSE; \
+ } \
+
function_entry cpdf_functions[] = {
PHP_FE(cpdf_global_set_document_limits, NULL)
PHP_FE(cpdf_set_creator, NULL)
@@ -261,14 +270,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long(arg1);
+ CPDF_FETCH_CPDFDOC(arg1);
convert_to_string(arg2);
- id=Z_LVAL_P(arg1);
- pdf = zend_list_find(id, type);
- if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
- php_error(E_WARNING, %s(): Unable to find identifier %d (type=%d),
get_active_function_name(TSRMLS_C), id, type);
- RETURN_FALSE;
- }
cpdf_setCreator(pdf, Z_STRVAL_P(arg2));
@@ -288,14 +291,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long(arg1);
+ CPDF_FETCH_CPDFDOC(arg1);
convert_to_string(arg2);
- id=Z_LVAL_P(arg1);
- pdf = zend_list_find(id, type);
- if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
- php_error(E_WARNING, %s(): Unable to find identifier %d (type=%d),
get_active_function_name(TSRMLS_C), id, type);
- RETURN_FALSE;
- }
cpdf_setTitle(pdf, Z_STRVAL_P(arg2));
@@ -316,14 +313,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long(arg1);
+ CPDF_FETCH_CPDFDOC(arg1);
convert_to_string(arg2);
- id=Z_LVAL_P(arg1);
- pdf = zend_list_find(id, type);
- if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
- php_error(E_WARNING, %s(): Unable to find identifier %d (type=%d),
get_active_function_name(TSRMLS_C), id, type);
- RETURN_FALSE;
- }
cpdf_setSubject(pdf, Z_STRVAL_P(arg2));
@@ -343,14 +334,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long(arg1);
+ CPDF_FETCH_CPDFDOC(arg1);
convert_to_string(arg2);
- id=Z_LVAL_P(arg1);
- pdf = zend_list_find(id, type);
- if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
- php_error(E_WARNING, %s(): Unable to find identifier %d (type=%d),
get_active_function_name(TSRMLS_C), id, type);
- RETURN_FALSE;
- }
cpdf_setKeywords(pdf, Z_STRVAL_P(arg2));
@@ -374,17 +359,9 @@
if (getParameters(ht, 2, arg1, arg2) == FAILURE)
WRONG_PARAM_COUNT;
- convert_to_long(arg1);
+ CPDF_FETCH_CPDFDOC(arg1);
convert_to_array(arg2);
- id = Z_LVAL_P (arg1);
-
- pdf = zend_list_find(id, type);
- if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
- php_error(E_WARNING, %s(): Unable to find identifier %d,
get_active_function_name(TSRMLS_C), id);
- RETURN_FALSE;
- }
-
if (zend_hash_find (Z_ARRVAL_P(arg2), pagemode, sizeof (pagemode), (void
**) zvalue) == SUCCESS)
{
convert_to_long_ex (zvalue);
@@ -475,7 +452,7 @@
convert_to_string(arg2);
#if APACHE
if(strcmp(Z_STRVAL_P(arg2), -) == 0)
- php_error(E_WARNING, %s(): Writing to stdout as described in
the ClibPDF manual is not possible if php is used as an Apache module. Write to a
memory stream and use cpdf_output_buffer() instead.,
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Writing to stdout
+as described in the ClibPDF manual is not possible if php is used as an Apache
+module. Write to a memory stream and use cpdf_output_buffer() instead.);
#endif
cpdf_setOutputFilename(cpdf, Z_STRVAL_P(arg2));
}
@@ -498,13 +475,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long(arg1);
- id=Z_LVAL_P(arg1);
- pdf = zend_list_find(id, type);
- if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) {
- php_error(E_WARNING, %s(): Unable to find identifier %d,
get_active_function_name(TSRMLS_C), id);
-
[PHP-CVS] cvs: php4 /ext/standard filters.c
moriyoshi Tue Jan 14 11:42:19 2003 EDT
Modified files:
/php4/ext/standard filters.c
Log:
Added a new option force-encode-first to the quoted-printable encoder
as per Wez's request. If enabled, the encoder forcefully does qp
tranformation on every first character of lines in incoming stream.
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.17 php4/ext/standard/filters.c:1.18
--- php4/ext/standard/filters.c:1.17Mon Jan 13 20:27:57 2003
+++ php4/ext/standard/filters.c Tue Jan 14 11:42:18 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: filters.c,v 1.17 2003/01/14 01:27:57 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.18 2003/01/14 16:42:18 moriyoshi Exp $ */
#include php.h
#include php_globals.h
@@ -665,7 +665,8 @@
unsigned int lb_cnt;
} php_conv_qprint_encode;
-#define PHP_CONV_QPRINT_OPT_BINARY 0x0001
+#define PHP_CONV_QPRINT_OPT_BINARY 0x0001
+#define PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST 0x0002
static void php_conv_qprint_encode_dtor(php_conv_qprint_encode *inst);
static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *inst,
const char **in_pp, size_t *in_left_p, char **out_pp, size_t *out_left_p);
@@ -772,7 +773,7 @@
line_ccnt--;
CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
}
- } else if ((c = 33 c = 60) || (c = 62 c = 126)) {
+ } else if ((!(opts PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST) ||
+line_ccnt inst-line_len) ((c = 33 c = 60) || (c = 62 c = 126))) {
if (line_ccnt 2) {
if (ocnt inst-lbchars_len + 1) {
err = PHP_CONV_ERR_TOO_BIG;
@@ -1172,10 +1173,12 @@
if (options != NULL) {
int opt_binary = 0;
+ int opt_force_encode_first = 0;
GET_STR_PROP(options, lbchars, lbchars_len,
line-break-chars, 0);
GET_UINT_PROP(options, line_len, line-length);
GET_BOOL_PROP(options, opt_binary, binary);
+ GET_BOOL_PROP(options, opt_force_encode_first,
+force-encode-first);
if (line_len 4) {
if (lbchars != NULL) {
@@ -1189,6 +1192,7 @@
}
}
opts |= (opt_binary ? PHP_CONV_QPRINT_OPT_BINARY : 0);
+ opts |= (opt_force_encode_first ?
+PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST : 0);
}
retval = pemalloc(sizeof(php_conv_qprint_encode), persistent);
if (lbchars != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/hyperwave hw.c
iliaa Tue Jan 14 12:44:56 2003 EDT
Modified files:
/php4/ext/hyperwave hw.c
Log:
Changed php_error to php_error_docref.
Got rid off the ancient getParameters* parameter parsing API.
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.112 php4/ext/hyperwave/hw.c:1.113
--- php4/ext/hyperwave/hw.c:1.112 Tue Dec 31 11:06:42 2002
+++ php4/ext/hyperwave/hw.c Tue Jan 14 12:44:55 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hw.c,v 1.112 2002/12/31 16:06:42 sebastian Exp $ */
+/* $Id: hw.c,v 1.113 2003/01/14 17:44:55 iliaa Exp $ */
#include stdlib.h
#include errno.h
@@ -142,6 +142,24 @@
ZEND_GET_MODULE(hw)
#endif
+#define HW_FETCH_LINK(hw_zval) \
+ convert_to_long_ex(hw_zval); \
+ link = Z_LVAL_PP(hw_zval); \
+ ptr = (hw_connection *) zend_list_find(link, type); \
+ if(!ptr || (type != le_socketp type != le_psocketp)) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find file
+identifier %d, link); \
+ RETURN_FALSE; \
+ }
+
+#define HW_FETCH_ID(hw_zval) \
+ convert_to_long_ex(hw_zval); \
+ id = Z_LVAL_PP(hw_zval); \
+ ptr = zend_list_find(id, type); \
+ if(!ptr || (type != le_socketp type != le_psocketp)) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find file
+identifier %d, id); \
+ RETURN_FALSE; \
+ }
+
void print_msg(hg_msg *msg, char *str, int txt);
void _close_hw_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -753,7 +771,7 @@
if(host) efree(host);
if(password) efree(password);
if(username) efree(username);
- php_error(E_ERROR, %s(): Could not get memory for connection
details, get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Could not get memory for
+connection details);
RETURN_FALSE;
}
sprintf(hashed_details, hw_%s_%d, host, port);
@@ -766,7 +784,7 @@
list_entry new_le;
if (HwSG(max_links)!=-1 HwSG(num_links)=HwSG(max_links)) {
- php_error(E_ERROR, %s(): Too many open links (%d),
get_active_function_name(TSRMLS_C), HwSG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Too many
+open links (%d), HwSG(num_links));
if(host) efree(host);
if(username) efree(username);
if(password) efree(password);
@@ -774,7 +792,7 @@
RETURN_FALSE;
}
if (HwSG(max_persistent!=-1)
HwSG(num_persistent)=HwSG(max_persistent)) {
- php_error(E_ERROR, %s(): Too many open persistent
links (%d), get_active_function_name(TSRMLS_C), HwSG(num_persistent));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Too many
+open persistent links (%d), HwSG(num_persistent));
if(host) efree(host);
if(username) efree(username);
if(password) efree(password);
@@ -783,7 +801,7 @@
}
if ( (sockfd = open_hg_connection(host, port)) 0 ) {
- php_error(E_ERROR, %s(): Could not open connection to
%s, Port: %d (retval=%d, errno=%d), get_active_function_name(TSRMLS_C), host, port,
sockfd, errno);
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Could not
+open connection to %s, Port: %d (retval=%d, errno=%d), host, port, sockfd, errno);
if(host) efree(host);
if(username) efree(username);
if(password) efree(password);
@@ -792,7 +810,7 @@
}
if(NULL == (ptr = malloc(sizeof(hw_connection {
- php_error(E_ERROR, %s(): Could not get memory for
connection structure, get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Could not
+get memory for connection structure);
if(host) efree(host);
if(username) efree(username);
if(password) efree(password);
@@ -801,7 +819,7 @@
}
if(0 != (ptr-lasterror = initialize_hg_connection(sockfd,
do_swap, version, userdata, server_string, username, password))) {
- php_error(E_ERROR, %s(): Could not initalize
hyperwave connection, get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC,
[PHP-CVS] cvs: php4 /ext/hyperwave hg_comm.c
iliaa Tue Jan 14 12:45:32 2003 EDT
Modified files:
/php4/ext/hyperwave hg_comm.c
Log:
Fixed compile warning removed useless variable.
Index: php4/ext/hyperwave/hg_comm.c
diff -u php4/ext/hyperwave/hg_comm.c:1.53 php4/ext/hyperwave/hg_comm.c:1.54
--- php4/ext/hyperwave/hg_comm.c:1.53 Tue Dec 31 11:06:41 2002
+++ php4/ext/hyperwave/hg_comm.cTue Jan 14 12:45:30 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hg_comm.c,v 1.53 2002/12/31 16:06:41 sebastian Exp $ */
+/* $Id: hg_comm.c,v 1.54 2003/01/14 17:45:30 iliaa Exp $ */
/* #define HW_DEBUG */
@@ -42,6 +42,7 @@
# include netdb.h
# include unistd.h
# include sys/param.h
+# include arpa/inet.h
#endif
#include fcntl.h
#include errno.h
@@ -5034,10 +5035,8 @@
switch(hostptr-h_addrtype) {
struct in_addr *ptr1;
- char *ptr;
case AF_INET:
- ptr = hostptr-h_addr_list[0];
- ptr1 = (struct in_addr *) ptr;
+ ptr1 = (struct in_addr *) hostptr-h_addr_list[0];
hostip = inet_ntoa(*ptr1);
break;
default:
@@ -5221,10 +5220,8 @@
switch(hostptr-h_addrtype) {
struct in_addr *ptr1;
- char *ptr;
case AF_INET:
- ptr = hostptr-h_addr_list[0];
- ptr1 = (struct in_addr *) ptr;
+ ptr1 = (struct in_addr *) hostptr-h_addr_list[0];
hostip = inet_ntoa(*ptr1);
break;
default:
@@ -5403,10 +5400,8 @@
switch(hostptr-h_addrtype) {
struct in_addr *ptr1;
- char *ptr;
case AF_INET:
- ptr = hostptr-h_addr_list[0];
- ptr1 = (struct in_addr *) ptr;
+ ptr1 = (struct in_addr *) hostptr-h_addr_list[0];
hostip = inet_ntoa(*ptr1);
break;
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c php_var.h var.c
andrey Tue Jan 14 13:26:47 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c php_var.h var.c
Log:
added function get_memory_usage(). available only when PHP is compiled
with --enable-memory-limit
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.559
php4/ext/standard/basic_functions.c:1.560
--- php4/ext/standard/basic_functions.c:1.559 Mon Jan 13 13:12:23 2003
+++ php4/ext/standard/basic_functions.c Tue Jan 14 13:26:47 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.559 2003/01/13 18:12:23 andrey Exp $ */
+/* $Id: basic_functions.c,v 1.560 2003/01/14 18:26:47 andrey Exp $ */
#include php.h
#include php_streams.h
@@ -544,6 +544,9 @@
PHP_FE(var_export,
NULL)
PHP_FE(debug_zval_dump,
NULL)
PHP_FE(print_r,
NULL)
+#if MEMORY_LIMIT
+ PHP_FE(get_memory_usage,
+ NULL)
+#endif
PHP_FE(register_shutdown_function,
NULL)
PHP_FE(register_tick_function,
NULL)
Index: php4/ext/standard/php_var.h
diff -u php4/ext/standard/php_var.h:1.22 php4/ext/standard/php_var.h:1.23
--- php4/ext/standard/php_var.h:1.22Tue Dec 31 11:07:54 2002
+++ php4/ext/standard/php_var.h Tue Jan 14 13:26:47 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_var.h,v 1.22 2002/12/31 16:07:54 sebastian Exp $ */
+/* $Id: php_var.h,v 1.23 2003/01/14 18:26:47 andrey Exp $ */
#ifndef PHP_VAR_H
#define PHP_VAR_H
@@ -28,6 +28,9 @@
PHP_FUNCTION(debug_zval_dump);
PHP_FUNCTION(serialize);
PHP_FUNCTION(unserialize);
+#if MEMORY_LIMIT
+PHP_FUNCTION(get_memory_usage);
+#endif
void php_var_dump(zval **struc, int level TSRMLS_DC);
void php_var_export(zval **struc, int level TSRMLS_DC);
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.153 php4/ext/standard/var.c:1.154
--- php4/ext/standard/var.c:1.153 Sun Jan 12 08:50:17 2003
+++ php4/ext/standard/var.c Tue Jan 14 13:26:47 2003
@@ -677,6 +677,15 @@
/* }}} */
+#if MEMORY_LIMIT
+/* {{{ proto int get_memory_usage()
+Returns the allocated by PHP memory */
+PHP_FUNCTION(get_memory_usage) {
+ RETURN_LONG(AG(allocated_memory));
+}
+/* }}} */
+#endif
+
/*
* Local variables:
* tab-width: 4
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard filters.c
It should be noted that this is only necessary for lines beginning with
the string From which some mtas will mangle in transit, thus
rendering digital signatures invalid.
--Wez.
On Tue, 14 Jan 2003, Moriyoshi Koizumi wrote:
moriyoshi Tue Jan 14 11:42:19 2003 EDT
Modified files:
/php4/ext/standardfilters.c
Log:
Added a new option force-encode-first to the quoted-printable encoder
as per Wez's request. If enabled, the encoder forcefully does qp
tranformation on every first character of lines in incoming stream.
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.17 php4/ext/standard/filters.c:1.18
--- php4/ext/standard/filters.c:1.17 Mon Jan 13 20:27:57 2003
+++ php4/ext/standard/filters.c Tue Jan 14 11:42:18 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: filters.c,v 1.17 2003/01/14 01:27:57 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.18 2003/01/14 16:42:18 moriyoshi Exp $ */
#include php.h
#include php_globals.h
@@ -665,7 +665,8 @@
unsigned int lb_cnt;
} php_conv_qprint_encode;
-#define PHP_CONV_QPRINT_OPT_BINARY 0x0001
+#define PHP_CONV_QPRINT_OPT_BINARY 0x0001
+#define PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST 0x0002
static void php_conv_qprint_encode_dtor(php_conv_qprint_encode *inst);
static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *inst,
const char **in_pp, size_t *in_left_p, char **out_pp, size_t *out_left_p);
@@ -772,7 +773,7 @@
line_ccnt--;
CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
}
- } else if ((c = 33 c = 60) || (c = 62 c = 126)) {
+ } else if ((!(opts PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST) ||
line_ccnt inst-line_len) ((c = 33 c = 60) || (c = 62 c = 126))) {
if (line_ccnt 2) {
if (ocnt inst-lbchars_len + 1) {
err = PHP_CONV_ERR_TOO_BIG;
@@ -1172,10 +1173,12 @@
if (options != NULL) {
int opt_binary = 0;
+ int opt_force_encode_first = 0;
GET_STR_PROP(options, lbchars, lbchars_len,
line-break-chars, 0);
GET_UINT_PROP(options, line_len, line-length);
GET_BOOL_PROP(options, opt_binary, binary);
+ GET_BOOL_PROP(options, opt_force_encode_first,
force-encode-first);
if (line_len 4) {
if (lbchars != NULL) {
@@ -1189,6 +1192,7 @@
}
}
opts |= (opt_binary ? PHP_CONV_QPRINT_OPT_BINARY : 0);
+ opts |= (opt_force_encode_first ?
PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST : 0);
}
retval = pemalloc(sizeof(php_conv_qprint_encode), persistent);
if (lbchars != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv/tests iconv_mime_decode.phpt
moriyoshi Tue Jan 14 14:25:10 2003 EDT Modified files: /php4/ext/iconv/tests iconv_mime_decode.phpt Log: Test update for new feature Index: php4/ext/iconv/tests/iconv_mime_decode.phpt diff -u php4/ext/iconv/tests/iconv_mime_decode.phpt:1.1 php4/ext/iconv/tests/iconv_mime_decode.phpt:1.2 --- php4/ext/iconv/tests/iconv_mime_decode.phpt:1.1 Fri Jan 3 15:33:53 2003 +++ php4/ext/iconv/tests/iconv_mime_decode.phpt Tue Jan 14 14:25:10 2003 @@ -8,7 +8,7 @@ ?php $header = HERE Subject: =?ISO-8859-1?Q?Pr=FCfung?= - =?ISO-8859-1?Q?=20Pr=FCfung?= + =?ISO-8859-1*de_DE?Q?=20Pr=FCfung?= =?ISO-8859-2?Q?k=F9=D4=F1=D3let?= HERE; $result = iconv_mime_decode($header, UTF-8); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv iconv.c
moriyoshi Tue Jan 14 14:26:00 2003 EDT Modified files: /php4/ext/iconv iconv.c Log: Appended my name to the list of authors Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.81 php4/ext/iconv/iconv.c:1.82 --- php4/ext/iconv/iconv.c:1.81 Thu Jan 9 23:32:25 2003 +++ php4/ext/iconv/iconv.c Tue Jan 14 14:26:00 2003 @@ -14,10 +14,11 @@ +--+ | Authors: Rui Hirokawa [EMAIL PROTECTED] | | Stig Bakken [EMAIL PROTECTED] | + | Moriyoshi Koizumi [EMAIL PROTECTED] | +--+ */ -/* $Id: iconv.c,v 1.81 2003/01/10 04:32:25 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.82 2003/01/14 19:26:00 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H #include config.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/cpdf cpdf.c
iliaa Tue Jan 14 14:59:49 2003 EDT
Modified files:
/php4/ext/cpdf cpdf.c
Log:
Fixed typos.
Index: php4/ext/cpdf/cpdf.c
diff -u php4/ext/cpdf/cpdf.c:1.47 php4/ext/cpdf/cpdf.c:1.48
--- php4/ext/cpdf/cpdf.c:1.47 Tue Jan 14 13:54:44 2003
+++ php4/ext/cpdf/cpdf.cTue Jan 14 14:59:48 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cpdf.c,v 1.47 2003/01/14 18:54:44 iliaa Exp $ */
+/* $Id: cpdf.c,v 1.48 2003/01/14 19:59:48 iliaa Exp $ */
/* cpdflib.h -- C language API definitions for ClibPDF library
* Copyright (C) 1998 FastIO Systems, All Rights Reserved.
*/
@@ -238,9 +238,8 @@
PHP_FUNCTION(cpdf_global_set_document_limits)
{
zval **argv[5];
- int argc;
- if (ZEND_NUM_ARGS() != 5 || (zend_get_parameters_array_ex(argc, argv) ==
FAILURE)) {
+ if (ZEND_NUM_ARGS() != 5 || (zend_get_parameters_array_ex(5, argv) ==
+FAILURE)) {
WRONG_PARAM_COUNT;
}
@@ -883,6 +882,7 @@
CPDF_FETCH_CPDFDOC(arg1);
convert_to_array_ex(arg2);
+ matrix = Z_ARRVAL_P(arg2);
if(zend_hash_num_elements(matrix) != 6) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Text matrix must have 6
elements);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/cpdf cpdf.c
iliaa Tue Jan 14 15:02:44 2003 EDT
Modified files:
/php4/ext/cpdf cpdf.c
Log:
One more typo.
Index: php4/ext/cpdf/cpdf.c
diff -u php4/ext/cpdf/cpdf.c:1.48 php4/ext/cpdf/cpdf.c:1.49
--- php4/ext/cpdf/cpdf.c:1.48 Tue Jan 14 14:59:48 2003
+++ php4/ext/cpdf/cpdf.cTue Jan 14 15:02:42 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cpdf.c,v 1.48 2003/01/14 19:59:48 iliaa Exp $ */
+/* $Id: cpdf.c,v 1.49 2003/01/14 20:02:42 iliaa Exp $ */
/* cpdflib.h -- C language API definitions for ClibPDF library
* Copyright (C) 1998 FastIO Systems, All Rights Reserved.
*/
@@ -882,7 +882,7 @@
CPDF_FETCH_CPDFDOC(arg1);
convert_to_array_ex(arg2);
- matrix = Z_ARRVAL_P(arg2);
+ matrix = Z_ARRVAL_PP(arg2);
if(zend_hash_num_elements(matrix) != 6) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Text matrix must have 6
elements);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/hyperwave hw.c
iliaa Tue Jan 14 15:05:39 2003 EDT
Modified files:
/php4/ext/hyperwave hw.c
Log:
Fixed compile warnings.
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.113 php4/ext/hyperwave/hw.c:1.114
--- php4/ext/hyperwave/hw.c:1.113 Tue Jan 14 12:44:55 2003
+++ php4/ext/hyperwave/hw.c Tue Jan 14 15:05:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hw.c,v 1.113 2003/01/14 17:44:55 iliaa Exp $ */
+/* $Id: hw.c,v 1.114 2003/01/14 20:05:37 iliaa Exp $ */
#include stdlib.h
#include errno.h
@@ -1349,7 +1349,13 @@
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg1) == FAILURE) {
return NULL;
}
- HW_FETCH_LINK(arg1);
+ convert_to_long_ex(arg1);
+ link = Z_LVAL_PP(arg1);
+ ptr = (hw_connection *) zend_list_find(link, type);
+ if(!ptr || (type != le_socketp type != le_psocketp)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find file
+identifier %d, link);
+ return NULL;
+ }
set_swap(ptr-swap_on);
{
@@ -2746,7 +2752,7 @@
int use_include_path=0;
hw_document *doc;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, arg1, arg2) ==
FAILURE) {
+ if (ZEND_NUM_ARGS() != 2 || (zend_get_parameters_ex(2, arg1, arg2) ==
+FAILURE)) {
WRONG_PARAM_COUNT;
}
@@ -2872,7 +2878,7 @@
int id, type;
hw_document *ptr;
- if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, arg1) == FAILURE)) {
+ if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, arg1) == FAILURE)) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/domxml php_domxml.c
iliaa Tue Jan 14 15:07:55 2003 EDT
Modified files:
/php4/ext/domxmlphp_domxml.c
Log:
Changed getParameters() to zend_get_parameters_ex().
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.233 php4/ext/domxml/php_domxml.c:1.234
--- php4/ext/domxml/php_domxml.c:1.233 Mon Jan 13 03:19:50 2003
+++ php4/ext/domxml/php_domxml.cTue Jan 14 15:07:52 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.233 2003/01/13 08:19:50 derick Exp $ */
+/* $Id: php_domxml.c,v 1.234 2003/01/14 20:07:52 iliaa Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1636,13 +1636,14 @@
Unity function for testing */
PHP_FUNCTION(domxml_test)
{
- zval *id;
+ zval **id;
- if ((ZEND_NUM_ARGS() != 1) || getParameters(ht, 1, id) == FAILURE)
+ if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, id) == FAILURE)) {
WRONG_PARAM_COUNT;
+ }
- convert_to_long(id);
- RETURN_LONG(Z_LVAL_P(id));
+ convert_to_long_ex(id);
+ RETURN_LONG(Z_LVAL_PP(id));
}
/* }}} */
@@ -2854,18 +2855,18 @@
/* since this function is not implemented, outcomment it for the time beeing
PHP_FUNCTION(domxml_elem_set_attribute_node)
{
- zval *id, *arg1, *rv = NULL;
+ zval *id, **arg1, *rv = NULL;
xmlNode *nodep;
xmlAttr *attrp, *newattrp;
int ret;
- if ((ZEND_NUM_ARGS() == 1) getParameters(ht, 1, arg1) == SUCCESS) {
- id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
- attrp = php_dom_get_object(arg1, le_domxmlattrp, 0 TSRMLS_CC);
- } else {
+ if ((ZEND_NUM_ARGS() == 1) (zend_get_parameters_ex(1, arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
+
+ id = getThis();
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
+ attrp = php_dom_get_object(*arg1, le_domxmlattrp, 0 TSRMLS_CC);
FIXME: The following line doesn't work
newattrp = xmlCopyProp(nodep, attrp);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xmlrpc xmlrpc-epi-php.c
iliaa Tue Jan 14 16:02:14 2003 EDT
Modified files:
/php4/ext/xmlrpcxmlrpc-epi-php.c
Log:
Made the code use php_error_docref().
Removed pointless checks around array_init() and emalloc().
Switched to zend_get_parameters_ex() argument parsing API.
Index: php4/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.28 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.29
--- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.28 Mon Jan 13 08:36:23 2003
+++ php4/ext/xmlrpc/xmlrpc-epi-php.cTue Jan 14 16:02:14 2003
@@ -307,11 +307,7 @@
return 0;
}
-#if ZEND_MODULE_API_NO = 20001222
#define my_zend_hash_get_current_key(ht, my_key, num_index)
zend_hash_get_current_key(ht, my_key, num_index, 0)
-#else
-#define my_zend_hash_get_current_key(ht, my_key, num_index)
zend_hash_get_current_key(ht, my_key, num_index)
-#endif
/*
@@ -610,18 +606,19 @@
}
break;
case xmlrpc_vector:
-if(array_init(elem) == SUCCESS) {
- XMLRPC_VALUE xIter = XMLRPC_VectorRewind(el);
-
- while( xIter ) {
- zval* val = XMLRPC_to_PHP(xIter);
- if(val) {
- add_zval(elem, XMLRPC_GetValueID(xIter), val);
- }
- xIter = XMLRPC_VectorNext(el);
- }
-}
-break;
+ array_init(elem);
+ {
+ XMLRPC_VALUE xIter = XMLRPC_VectorRewind(el);
+
+ while( xIter ) {
+ zval *val = XMLRPC_to_PHP(xIter);
+ if (val) {
+ add_zval(elem, XMLRPC_GetValueID(xIter), val);
+ }
+ xIter = XMLRPC_VectorNext(el);
+ }
+ }
+ break;
default:
break;
}
@@ -634,43 +631,40 @@
Generates XML for a method request */
PHP_FUNCTION(xmlrpc_encode_request)
{
- XMLRPC_REQUEST xRequest = NULL;
- zval* method, *vals, *out_opts;
- char* outBuf;
- php_output_options out;
-
- if( !(ARG_COUNT(ht) == 2 || ARG_COUNT(ht) == 3) ||
- getParameters(ht, ARG_COUNT(ht), method, vals, out_opts) == FAILURE) {
- WRONG_PARAM_COUNT; /* prints/logs a warning and returns */
- }
+ XMLRPC_REQUEST xRequest = NULL;
+ zval **method, **vals, **out_opts;
+ char* outBuf;
+ php_output_options out;
- set_output_options(out, (ARG_COUNT(ht) == 3) ? out_opts : 0);
+ if (ZEND_NUM_ARGS() 2 || ZEND_NUM_ARGS() 3 ||
+(zend_get_parameters_ex(ZEND_NUM_ARGS(), method, vals, out_opts) == FAILURE)) {
+ WRONG_PARAM_COUNT; /* prints/logs a warning and returns */
+ }
+ set_output_options(out, (ZEND_NUM_ARGS() == 3) ? *out_opts : 0);
- if(return_value_used) {
- xRequest = XMLRPC_RequestNew();
+ if(return_value_used) {
+ xRequest = XMLRPC_RequestNew();
- if(xRequest) {
- XMLRPC_RequestSetOutputOptions(xRequest, out.xmlrpc_out);
- if(Z_TYPE_P(method) == IS_NULL) {
-XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_response);
- }
- else {
-XMLRPC_RequestSetMethodName(xRequest, Z_STRVAL_P(method));
-XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_call);
- }
- if(Z_TYPE_P(vals) != IS_NULL) {
- XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(vals));
- }
+ if(xRequest) {
+ XMLRPC_RequestSetOutputOptions(xRequest, out.xmlrpc_out);
+ if (Z_TYPE_PP(method) == IS_NULL) {
+ XMLRPC_RequestSetRequestType(xRequest,
+xmlrpc_request_response);
+ } else {
+ XMLRPC_RequestSetMethodName(xRequest,
+Z_STRVAL_PP(method));
+ XMLRPC_RequestSetRequestType(xRequest,
+xmlrpc_request_call);
+ }
+ if (Z_TYPE_PP(vals) != IS_NULL) {
+ XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(*vals));
+ }
- outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
- if(outBuf) {
-RETVAL_STRING(outBuf, 1);
-free(outBuf);
- }
- XMLRPC_RequestFree(xRequest, 1);
- }
- }
+ outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
+ if(outBuf) {
+ RETVAL_STRING(outBuf, 1);
+ free(outBuf);
+ }
+ XMLRPC_RequestFree(xRequest, 1);
+ }
+ }
}
/* }}} */
@@ -678,31 +672,30 @@
Generates XML for a PHP value */
PHP_FUNCTION(xmlrpc_encode)
{
- XMLRPC_VALUE xOut = NULL;
- zval* arg1;
- char* outBuf;
-
-
[PHP-CVS] cvs: php4 /ext/rpc/xmlrpc xmlrpc-epi-php.c
iliaa Tue Jan 14 16:04:47 2003 EDT
Modified files:
/php4/ext/rpc/xmlrpcxmlrpc-epi-php.c
Log:
Porting of patch applied to ext/xmlrpc.
Index: php4/ext/rpc/xmlrpc/xmlrpc-epi-php.c
diff -u php4/ext/rpc/xmlrpc/xmlrpc-epi-php.c:1.28
php4/ext/rpc/xmlrpc/xmlrpc-epi-php.c:1.29
--- php4/ext/rpc/xmlrpc/xmlrpc-epi-php.c:1.28 Mon Jan 13 08:39:28 2003
+++ php4/ext/rpc/xmlrpc/xmlrpc-epi-php.cTue Jan 14 16:04:46 2003
@@ -307,11 +307,7 @@
return 0;
}
-#if ZEND_MODULE_API_NO = 20001222
#define my_zend_hash_get_current_key(ht, my_key, num_index)
zend_hash_get_current_key(ht, my_key, num_index, 0)
-#else
-#define my_zend_hash_get_current_key(ht, my_key, num_index)
zend_hash_get_current_key(ht, my_key, num_index)
-#endif
/*
@@ -610,18 +606,19 @@
}
break;
case xmlrpc_vector:
-if(array_init(elem) == SUCCESS) {
- XMLRPC_VALUE xIter = XMLRPC_VectorRewind(el);
-
- while( xIter ) {
- zval* val = XMLRPC_to_PHP(xIter);
- if(val) {
- add_zval(elem, XMLRPC_GetValueID(xIter), val);
- }
- xIter = XMLRPC_VectorNext(el);
- }
-}
-break;
+ array_init(elem);
+ {
+ XMLRPC_VALUE xIter = XMLRPC_VectorRewind(el);
+
+ while( xIter ) {
+ zval *val = XMLRPC_to_PHP(xIter);
+ if (val) {
+ add_zval(elem, XMLRPC_GetValueID(xIter), val);
+ }
+ xIter = XMLRPC_VectorNext(el);
+ }
+ }
+ break;
default:
break;
}
@@ -634,43 +631,40 @@
Generates XML for a method request */
PHP_FUNCTION(xmlrpc_encode_request)
{
- XMLRPC_REQUEST xRequest = NULL;
- zval* method, *vals, *out_opts;
- char* outBuf;
- php_output_options out;
-
- if( !(ARG_COUNT(ht) == 2 || ARG_COUNT(ht) == 3) ||
- getParameters(ht, ARG_COUNT(ht), method, vals, out_opts) == FAILURE) {
- WRONG_PARAM_COUNT; /* prints/logs a warning and returns */
- }
+ XMLRPC_REQUEST xRequest = NULL;
+ zval **method, **vals, **out_opts;
+ char* outBuf;
+ php_output_options out;
- set_output_options(out, (ARG_COUNT(ht) == 3) ? out_opts : 0);
+ if (ZEND_NUM_ARGS() 2 || ZEND_NUM_ARGS() 3 ||
+(zend_get_parameters_ex(ZEND_NUM_ARGS(), method, vals, out_opts) == FAILURE)) {
+ WRONG_PARAM_COUNT; /* prints/logs a warning and returns */
+ }
+ set_output_options(out, (ZEND_NUM_ARGS() == 3) ? *out_opts : 0);
- if(return_value_used) {
- xRequest = XMLRPC_RequestNew();
+ if(return_value_used) {
+ xRequest = XMLRPC_RequestNew();
- if(xRequest) {
- XMLRPC_RequestSetOutputOptions(xRequest, out.xmlrpc_out);
- if(Z_TYPE_P(method) == IS_NULL) {
-XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_response);
- }
- else {
-XMLRPC_RequestSetMethodName(xRequest, Z_STRVAL_P(method));
-XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_call);
- }
- if(Z_TYPE_P(vals) != IS_NULL) {
- XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(vals));
- }
+ if(xRequest) {
+ XMLRPC_RequestSetOutputOptions(xRequest, out.xmlrpc_out);
+ if (Z_TYPE_PP(method) == IS_NULL) {
+ XMLRPC_RequestSetRequestType(xRequest,
+xmlrpc_request_response);
+ } else {
+ XMLRPC_RequestSetMethodName(xRequest,
+Z_STRVAL_PP(method));
+ XMLRPC_RequestSetRequestType(xRequest,
+xmlrpc_request_call);
+ }
+ if (Z_TYPE_PP(vals) != IS_NULL) {
+ XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(*vals));
+ }
- outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
- if(outBuf) {
-RETVAL_STRING(outBuf, 1);
-free(outBuf);
- }
- XMLRPC_RequestFree(xRequest, 1);
- }
- }
+ outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
+ if(outBuf) {
+ RETVAL_STRING(outBuf, 1);
+ free(outBuf);
+ }
+ XMLRPC_RequestFree(xRequest, 1);
+ }
+ }
}
/* }}} */
@@ -678,31 +672,30 @@
Generates XML for a PHP value */
PHP_FUNCTION(xmlrpc_encode)
{
- XMLRPC_VALUE xOut = NULL;
- zval* arg1;
- char* outBuf;
-
- if( !(ARG_COUNT(ht) == 1) ||
- getParameters(ht, ARG_COUNT(ht), arg1) == FAILURE) {
[PHP-CVS] cvs: php4 /ext/cpdf cpdf.c php_cpdf.h
iliaa Tue Jan 14 19:52:07 2003 EDT Modified files: /php4/ext/cpdf cpdf.c php_cpdf.h Log: This patch allows cpdf to be compiled in conjunction with ncurses, which was not possible before due to conflicting defines. Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.49 php4/ext/cpdf/cpdf.c:1.50 --- php4/ext/cpdf/cpdf.c:1.49 Tue Jan 14 15:02:42 2003 +++ php4/ext/cpdf/cpdf.cTue Jan 14 19:52:06 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: cpdf.c,v 1.49 2003/01/14 20:02:42 iliaa Exp $ */ +/* $Id: cpdf.c,v 1.50 2003/01/15 00:52:06 iliaa Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -44,6 +44,8 @@ # include gd.h # endif #endif + +#include cpdflib.h #ifdef HAVE_UNISTD_H # include unistd.h Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.13 php4/ext/cpdf/php_cpdf.h:1.14 --- php4/ext/cpdf/php_cpdf.h:1.13 Tue Dec 31 11:06:19 2002 +++ php4/ext/cpdf/php_cpdf.hTue Jan 14 19:52:06 2003 @@ -15,7 +15,7 @@ | Author: Uwe Steinmann [EMAIL PROTECTED] | +--+ */ -/* $Id: php_cpdf.h,v 1.13 2002/12/31 16:06:19 sebastian Exp $ */ +/* $Id: php_cpdf.h,v 1.14 2003/01/15 00:52:06 iliaa Exp $ */ #ifndef PHP_CPDF_H #define PHP_CPDF_H @@ -28,8 +28,6 @@ #ifdef T #undef T #endif - -#include cpdflib.h extern zend_module_entry cpdf_module_entry; #define cpdf_module_ptr cpdf_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/cpdf cpdf.c php_cpdf.h
iliaa Tue Jan 14 19:52:20 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/cpdf cpdf.c php_cpdf.h Log: MFH Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.43.4.1 php4/ext/cpdf/cpdf.c:1.43.4.2 --- php4/ext/cpdf/cpdf.c:1.43.4.1 Tue Dec 31 11:34:13 2002 +++ php4/ext/cpdf/cpdf.cTue Jan 14 19:52:19 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: cpdf.c,v 1.43.4.1 2002/12/31 16:34:13 sebastian Exp $ */ +/* $Id: cpdf.c,v 1.43.4.2 2003/01/15 00:52:19 iliaa Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -40,6 +40,8 @@ #if HAVE_LIBGD13 #include gd.h #endif + +#include cpdflib.h #ifdef HAVE_UNISTD_H # include unistd.h Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.12.8.1 php4/ext/cpdf/php_cpdf.h:1.12.8.2 --- php4/ext/cpdf/php_cpdf.h:1.12.8.1 Tue Dec 31 11:34:14 2002 +++ php4/ext/cpdf/php_cpdf.hTue Jan 14 19:52:20 2003 @@ -15,7 +15,7 @@ | Author: Uwe Steinmann [EMAIL PROTECTED] | +--+ */ -/* $Id: php_cpdf.h,v 1.12.8.1 2002/12/31 16:34:14 sebastian Exp $ */ +/* $Id: php_cpdf.h,v 1.12.8.2 2003/01/15 00:52:20 iliaa Exp $ */ #ifndef PHP_CPDF_H #define PHP_CPDF_H @@ -28,8 +28,6 @@ #ifdef T #undef T #endif - -#include cpdflib.h extern zend_module_entry cpdf_module_entry; #define cpdf_module_ptr cpdf_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dbase dbase.c
iliaa Tue Jan 14 21:31:17 2003 EDT
Modified files:
/php4/ext/dbase dbase.c
Log:
Removed pointless checks around array_init() ZE memory allocation macros.
Changed php_error to php_error_docref.
Dropped getParam* parameter parsing API in favor of zend_get_parameters*.
Index: php4/ext/dbase/dbase.c
diff -u php4/ext/dbase/dbase.c:1.61 php4/ext/dbase/dbase.c:1.62
--- php4/ext/dbase/dbase.c:1.61 Tue Dec 31 11:06:26 2002
+++ php4/ext/dbase/dbase.c Tue Jan 14 21:31:16 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.61 2002/12/31 16:06:26 sebastian Exp $ */
+/* $Id: dbase.c,v 1.62 2003/01/15 02:31:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -118,28 +118,28 @@
Opens a dBase-format database file */
PHP_FUNCTION(dbase_open)
{
- pval *dbf_name, *options;
+ zval **dbf_name, **options;
dbhead_t *dbh;
int handle;
DBase_TLS_VARS;
- if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, dbf_name,
options)==FAILURE) {
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, dbf_name, options) ==
+FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_string(dbf_name);
- convert_to_long(options);
+ convert_to_string_ex(dbf_name);
+ convert_to_long_ex(options);
- if (PG(safe_mode) (!php_checkuid(Z_STRVAL_P(dbf_name), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
+ if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(dbf_name), NULL,
+CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
- if (php_check_open_basedir(Z_STRVAL_P(dbf_name) TSRMLS_CC)) {
+ if (php_check_open_basedir(Z_STRVAL_PP(dbf_name) TSRMLS_CC)) {
RETURN_FALSE;
}
- dbh = dbf_open(Z_STRVAL_P(dbf_name), Z_LVAL_P(options) TSRMLS_CC);
+ dbh = dbf_open(Z_STRVAL_P(dbf_name), Z_LVAL_PP(options) TSRMLS_CC);
if (dbh == NULL) {
- php_error(E_WARNING, unable to open database %s,
Z_STRVAL_P(dbf_name));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, unable to open database
+%s, Z_STRVAL_PP(dbf_name));
RETURN_FALSE;
}
@@ -152,22 +152,22 @@
Closes an open dBase-format database file */
PHP_FUNCTION(dbase_close)
{
- pval *dbh_id;
+ zval **dbh_id;
dbhead_t *dbh;
int dbh_type;
DBase_TLS_VARS;
- if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, dbh_id)==FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, dbh_id) == FAILURE)) {
WRONG_PARAM_COUNT;
}
- convert_to_long(dbh_id);
- dbh = zend_list_find(Z_LVAL_P(dbh_id), dbh_type);
+ convert_to_long_ex(dbh_id);
+ dbh = zend_list_find(Z_LVAL_PP(dbh_id), dbh_type);
if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) {
- php_error(E_WARNING, Unable to find database for identifier %d,
Z_LVAL_P(dbh_id));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find database
+for identifier %d, Z_LVAL_PP(dbh_id));
RETURN_FALSE;
}
- zend_list_delete(Z_LVAL_P(dbh_id));
+ zend_list_delete(Z_LVAL_PP(dbh_id));
RETURN_TRUE;
}
/* }}} */
@@ -176,18 +176,18 @@
Returns the number of records in the database */
PHP_FUNCTION(dbase_numrecords)
{
- pval *dbh_id;
+ zval **dbh_id;
dbhead_t *dbh;
int dbh_type;
DBase_TLS_VARS;
- if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, dbh_id)==FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, dbh_id) == FAILURE)) {
WRONG_PARAM_COUNT;
}
- convert_to_long(dbh_id);
- dbh = zend_list_find(Z_LVAL_P(dbh_id), dbh_type);
+ convert_to_long_ex(dbh_id);
+ dbh = zend_list_find(Z_LVAL_PP(dbh_id), dbh_type);
if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) {
- php_error(E_WARNING, Unable to find database for identifier %d,
Z_LVAL_P(dbh_id));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find database
+for identifier %d, Z_LVAL_PP(dbh_id));
RETURN_FALSE;
}
@@ -199,18 +199,18 @@
Returns the number of fields (columns) in the database */
PHP_FUNCTION(dbase_numfields)
{
- pval *dbh_id;
+ zval **dbh_id;
dbhead_t *dbh;
int dbh_type;
DBase_TLS_VARS;
- if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, dbh_id)==FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, dbh_id) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_long(dbh_id);
- dbh = zend_list_find(Z_LVAL_P(dbh_id), dbh_type);
+ convert_to_long_ex(dbh_id);
+ dbh = zend_list_find(Z_LVAL_PP(dbh_id), dbh_type);
if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) {
-
[PHP-CVS] cvs: php4 /ext/filepro filepro.c
iliaa Tue Jan 14 21:49:38 2003 EDT
Modified files:
/php4/ext/filepro filepro.c
Log:
Changed php_error to php_error_docref.
Made use of the more recent parameter parsing API, zend_get_parameters*.
Index: php4/ext/filepro/filepro.c
diff -u php4/ext/filepro/filepro.c:1.48 php4/ext/filepro/filepro.c:1.49
--- php4/ext/filepro/filepro.c:1.48 Tue Dec 31 11:06:36 2002
+++ php4/ext/filepro/filepro.c Tue Jan 14 21:49:38 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filepro.c,v 1.48 2002/12/31 16:06:36 sebastian Exp $ */
+/* $Id: filepro.c,v 1.49 2003/01/15 02:49:38 iliaa Exp $ */
/*
filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -192,7 +192,7 @@
Read and verify the map file */
PHP_FUNCTION(filepro)
{
- pval *dir;
+ zval **dir;
FILE *fp;
char workbuf[MAXPATHLEN];
char readbuf[256];
@@ -201,11 +201,11 @@
FP_FIELD *new_field, *tmp, *next;
FP_TLS_VARS;
- if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, dir) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, dir) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_string(dir);
+ convert_to_string_ex(dir);
/* free memory */
if (FP_GLOBAL(fp_database) != NULL) {
@@ -226,7 +226,7 @@
FP_GLOBAL(fp_fcount) = -1;
FP_GLOBAL(fp_keysize) = -1;
- snprintf(workbuf, sizeof(workbuf), %s/map, Z_STRVAL_P(dir));
+ snprintf(workbuf, sizeof(workbuf), %s/map, Z_STRVAL_PP(dir));
if (PG(safe_mode) (!php_checkuid(workbuf, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
@@ -237,20 +237,18 @@
}
if (!(fp = VCWD_FOPEN(workbuf, r))) {
- php_error(E_WARNING, %s(): Cannot open map: [%d] %s,
get_active_function_name(TSRMLS_C),
- errno, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot open map: [%d]
+%s, errno, strerror(errno));
RETURN_FALSE;
}
if (!fgets(readbuf, sizeof(readbuf), fp)) {
fclose(fp);
- php_error(E_WARNING, %s(): Cannot read map: [%d] %s,
get_active_function_name(TSRMLS_C),
- errno, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot read map: [%d]
+%s, errno, strerror(errno));
RETURN_FALSE;
}
/* Get the field count, assume the file is readable! */
if (strcmp(php_strtok_r(readbuf, :, strtok_buf), map)) {
- php_error(E_WARNING, %s(): Map file corrupt or encrypted,
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Map file corrupt or
+encrypted);
RETURN_FALSE;
}
FP_GLOBAL(fp_keysize) = atoi(php_strtok_r(NULL, :, strtok_buf));
@@ -261,8 +259,7 @@
for (i = 0; i FP_GLOBAL(fp_fcount); i++) {
if (!fgets(readbuf, sizeof(readbuf), fp)) {
fclose(fp);
- php_error(E_WARNING, %s(): Cannot read map: [%d] %s,
get_active_function_name(TSRMLS_C),
- errno, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot read map:
+[%d] %s, errno, strerror(errno));
RETURN_FALSE;
}
new_field = emalloc(sizeof(FP_FIELD));
@@ -285,7 +282,7 @@
}
fclose(fp);
- FP_GLOBAL(fp_database) = estrndup(Z_STRVAL_P(dir), Z_STRLEN_P(dir));
+ FP_GLOBAL(fp_database) = estrndup(Z_STRVAL_PP(dir), Z_STRLEN_PP(dir));
RETVAL_TRUE;
}
@@ -316,8 +313,7 @@
}
if (!FP_GLOBAL(fp_database)) {
- php_error(E_WARNING,
- %s(): Must set database directory first!,
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Must set database
+directory first!);
RETURN_FALSE;
}
@@ -335,8 +331,7 @@
}
if (!(fp = VCWD_FOPEN(workbuf, r))) {
- php_error(E_WARNING, %s(): Cannot open key: [%d] %s,
get_active_function_name(TSRMLS_C),
- errno, strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot open key: [%d]
+%s, errno, strerror(errno));
RETURN_FALSE;
}
while (!feof(fp)) {
@@ -362,32 +357,29 @@
Gets the name of a field */
PHP_FUNCTION(filepro_fieldname)
{
- pval *fno;
+ zval **fno;
FP_FIELD *lp;
int i;
FP_TLS_VARS;
- if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, fno) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 ||
[PHP-CVS] cvs: php4 /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/qtdom qtdom.c /ext/rpc/dotnet dotnet.cpp /ext/rpc/java java.c /ext/snmp winsnmp.c
iliaa Tue Jan 14 21:54:53 2003 EDT
Modified files:
/php4/ext/hwapi hwapi.cpp
/php4/ext/hyperwave hw.c
/php4/ext/qtdom qtdom.c
/php4/ext/snmp winsnmp.c
/php4/ext/rpc/java java.c
/php4/ext/rpc/dotnetdotnet.cpp
Log:
Getting rid of the old API parsing code.
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.2 php4/ext/hwapi/hwapi.cpp:1.3
--- php4/ext/hwapi/hwapi.cpp:1.2Thu Oct 24 09:14:36 2002
+++ php4/ext/hwapi/hwapi.cppTue Jan 14 21:54:51 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hwapi.cpp,v 1.2 2002/10/24 13:14:36 sas Exp $ */
+/* $Id: hwapi.cpp,v 1.3 2003/01/15 02:54:51 iliaa Exp $ */
#include stdlib.h
#include errno.h
@@ -4285,12 +4285,12 @@
/* {{{ proto string hwapi_object_insert(object attr)
Inserts new HW_API_Attribute into HW_API_Object */
PHP_FUNCTION(hwapi_object_insert) {
- zval *arg1, *id;
+ zval **arg1, *id;
HW_API_Object *objp;
HW_API_Attribute *attrp;
char *value;
- if ((ZEND_NUM_ARGS() != 1) || getParameters(ht, 1, arg1) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, arg1) == FAILURE)) {
WRONG_PARAM_COUNT;
}
id = getThis();
@@ -4298,7 +4298,7 @@
if(!objp) {
RETURN_FALSE;
}
- attrp = (HW_API_Attribute *) php_hwapi_get_object(arg1, le_hwapi_attributep);
+ attrp = (HW_API_Attribute *) php_hwapi_get_object(*arg1, le_hwapi_attributep);
objp-insert(*attrp);
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.114 php4/ext/hyperwave/hw.c:1.115
--- php4/ext/hyperwave/hw.c:1.114 Tue Jan 14 15:05:37 2003
+++ php4/ext/hyperwave/hw.c Tue Jan 14 21:54:51 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hw.c,v 1.114 2003/01/14 20:05:37 iliaa Exp $ */
+/* $Id: hw.c,v 1.115 2003/01/15 02:54:51 iliaa Exp $ */
#include stdlib.h
#include errno.h
@@ -2712,31 +2712,31 @@
Create a new document */
PHP_FUNCTION(hw_new_document)
{
- pval *arg1, *arg2, *arg3;
+ zval **arg1, **arg2, **arg3;
char *ptr;
hw_document *doc;
- if (ZEND_NUM_ARGS() != 3 || getParameters(ht, 3, arg1, arg2, arg3) ==
FAILURE) {
+ if (ZEND_NUM_ARGS() != 3 || (zend_get_parameters_ex(3, arg1, arg2, arg3) ==
+FAILURE)) {
WRONG_PARAM_COUNT;
}
- convert_to_string(arg1);
- convert_to_string(arg2);
- convert_to_long(arg3);
+ convert_to_string_ex(arg1);
+ convert_to_string_ex(arg2);
+ convert_to_long_ex(arg3);
doc = malloc(sizeof(hw_document));
if(NULL == doc)
RETURN_FALSE;
- doc-data = malloc(Z_LVAL_P(arg3)+1);
+ doc-data = malloc(Z_LVAL_PP(arg3)+1);
if(NULL == doc-data) {
free(doc);
RETURN_FALSE;
}
- memcpy(doc-data, Z_STRVAL_P(arg2), Z_LVAL_P(arg3));
+ memcpy(doc-data, Z_STRVAL_PP(arg2), Z_LVAL_PP(arg3));
ptr = doc-data;
- ptr[Z_LVAL_P(arg3)] = '\0';
- doc-attributes = strdup(Z_STRVAL_P(arg1));
+ ptr[Z_LVAL_PP(arg3)] = '\0';
+ doc-attributes = strdup(Z_STRVAL_PP(arg1));
doc-bodytag = NULL;
- doc-size = Z_LVAL_P(arg3);
+ doc-size = Z_LVAL_PP(arg3);
Z_LVAL_P(return_value) = zend_list_insert(doc, le_document);
Z_TYPE_P(return_value) = IS_LONG;
}
Index: php4/ext/qtdom/qtdom.c
diff -u php4/ext/qtdom/qtdom.c:1.17 php4/ext/qtdom/qtdom.c:1.18
--- php4/ext/qtdom/qtdom.c:1.17 Tue Dec 31 11:07:19 2002
+++ php4/ext/qtdom/qtdom.c Tue Jan 14 21:54:52 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: qtdom.c,v 1.17 2002/12/31 16:07:19 sebastian Exp $ */
+/* $Id: qtdom.c,v 1.18 2003/01/15 02:54:52 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -209,7 +209,7 @@
creates a tree of an xml string */
PHP_FUNCTION(qdom_tree)
{
- zval *arg;
+ zval **arg;
char qt_ver1[200];
char *qt_ver = qt_ver1;
char *qdom_type_name;
@@ -217,11 +217,10 @@
struct qdom_node *node;
zval *children;
- if (ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, arg) == FAILURE)
-{
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_string(arg);
+ convert_to_string_ex(arg);
qdom_do_install_message_handler();
@@ -230,7 +229,7 @@
object_init_ex(return_value, qdomdoc_class_entry_ptr);
add_property_stringl(return_value, version, (char *) qt_ver, strlen(qt_ver),
1);
-doc = qdom_do_init( Z_STRVAL_P(arg) );
+doc = qdom_do_init( Z_STRVAL_PP(arg) );
qdom_do_doc_type( doc, qdom_type_name );
Index:
[PHP-CVS] cvs: php4 /ext/interbase interbase.c
iliaa Tue Jan 14 22:37:12 2003 EDT
Modified files:
/php4/ext/interbase interbase.c
Log:
Kill compile warning.
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.93 php4/ext/interbase/interbase.c:1.94
--- php4/ext/interbase/interbase.c:1.93 Tue Jan 14 22:01:16 2003
+++ php4/ext/interbase/interbase.c Tue Jan 14 22:37:11 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.93 2003/01/15 03:01:16 iliaa Exp $ */
+/* $Id: interbase.c,v 1.94 2003/01/15 03:37:11 iliaa Exp $ */
/* TODO: Arrays, roles?
@@ -609,7 +609,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.93 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.94 $);
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
#endif
@@ -2173,7 +2173,7 @@
{
_php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FETCH_ARRAY);
if (Z_TYPE_P(return_value) == IS_ARRAY) {
- object_and_properties_init(return_value, zend_standard_class_def,
Z_ARRVAL_P(return_value));
+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR,
+Z_ARRVAL_P(return_value));
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/yaz config.m4
dickmeiss Wed Jan 15 02:57:51 2003 EDT Modified files: /php4/ext/yaz config.m4 Log: Fix lib config for the case where YAZ depends on multiple libraries Index: php4/ext/yaz/config.m4 diff -u php4/ext/yaz/config.m4:1.11 php4/ext/yaz/config.m4:1.12 --- php4/ext/yaz/config.m4:1.11 Fri Sep 20 11:42:20 2002 +++ php4/ext/yaz/config.m4 Wed Jan 15 02:57:51 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2002/09/20 15:42:20 sniper Exp $ +dnl $Id: config.m4,v 1.12 2003/01/15 07:57:51 dickmeiss Exp $ dnl PHP_ARG_WITH(yaz,for YAZ support, @@ -32,25 +32,19 @@ AC_MSG_ERROR([YAZ version 1.9 or later required.]) fi -dir= for c in $YAZLIB; do case $c in -L*) dir=`echo $c|cut -c 3-|sed 's%/\.libs%%g'` + PHP_ADD_LIBPATH($dir,YAZ_SHARED_LIBADD) ;; - -lyaz*) -;; - *) - PHP_EVAL_LIBLINE($c, YAZ_SHARED_LIBADD) + -l*) + lib=`echo $c|cut -c 3-` +PHP_ADD_LIBRARY($lib,YAZ_SHARED_LIBADD) ;; esac done -if test -n $dir; then - PHP_ADD_LIBPATH($dir,YAZ_SHARED_LIBADD) -fi -PHP_ADD_LIBRARY_DEFER(yaz,1,YAZ_SHARED_LIBADD) PHP_EVAL_INCLINE($YAZINC) -PHP_SUBST(YAZ_SHARED_LIBADD) PHP_NEW_EXTENSION(yaz, php_yaz.c, $ext_shared) else AC_MSG_ERROR([YAZ not found (missing $yazconfig)]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
