RE: [jug-discussion] Help needed with trivial Java - VB6 and/or VB.NET rewrite
I'd do a c# version :)
-Original Message-
From: William H. Mitchell [mailto:whm;mse.com]
Sent: Wednesday, November 06, 2002 8:41 AM
To: [EMAIL PROTECTED]
Subject: [jug-discussion] Help needed with trivial Java - VB6 and/or VB.NET
rewrite
I'm teaching a class on object-oriented analysis and design next week and I
just learned in the last couple of days that many of the attendees will be
most conversant in Visual Basic 6.0.
I'm looking for somebody to rewrite a couple of small Java examples in VB6
and/or VB.NET, and maybe answer some questions, too. I can pay about $50
for the rewrites (150+/- lines of Java, some blank/trivial) and maybe
50c/minute for questions on the phone (DOE). It would need to be done by
the first thing Saturday morning (11/9).
If you're interested you can reach me via mail or at 577-6431.
Here's the interview: Convert this Java code to VB6 or VB.NET:
class Counter {
public Counter(String name) {
_count = 0;
_name = name;
}
public void bump() {
_count = _count + 1;
}
public void print() {
System.out.println(_name + 's count is + _count);
}
public int getCount() {
return _count;
}
private int _count;
private String _name;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: jug
Re: [iagi-net-l] Bayah-Jatibarang ? (was :Re: [iagi-net-l] tempo doeloe
iagi-net
Chronological
--
Find
Thread
--
Re: [iagi-net-l] Bayah-Jatibarang ? (was :Re: [iagi-net-l] tempo doeloe - Ekspedisi Devon Mahasiswa Geologi ITB)
From: Awang Satyana
Subject: Re: [iagi-net-l] Bayah-Jatibarang ? (was :Re: [iagi-net-l] tempo doeloe - Ekspedisi Devon Mahasiswa Geologi ITB)
Date: Thu, 04 Mar 2004 17:36:14 -0800
RE: [jug-discussion] Help needed with trivial Java - VB6 and/or VB.NET rewrite
Art Gramlich
Wed, 06 Nov 2002 07:56:08 -0800
Menarik Pak soal memutus hubungan antara Luk Ulo dan Meratus, saya menampilkan hal
yang sama, yaitu bahwa ofiolit Meratus berdiri sendiri dan tidak bersambung dengan Luk
Ulo, di PIT IAGI kemarin dalam paper berjudul Accretion and Dispersion of SE
Sundaland : the Growing and Slivering of a Continent (saya akan kirim ke Pak
Koesoema). Ofiolit/melange Meratus yang sedemikian besarnya dibanding spotted seperti
di Ciletuh dan Luk Ulo mengesankan bahwa mekanismenya bukan melalui scrapping off
kerak samudra di subduction, tetapi emplacement model obduction oleh dua
micro-continent yang collided (Schwaner x Paternoster). Saya menyambungkan Luk Ulo ke
Bantimala berdasarkan umur, mekanisme emplacement, fasies metamorfik dan kandungan
radiolaria. Hanya mekanisme transduction tidak saya aplikasikan di situ.
Kalau Bayah bersambung dengan Jatibarang, maka ada dua pertanyaan : (1) berapa gap
umur antara terjadinya subduction dengan munculnya volcanic arc asosiasinya, apakah
sejauh Late Cretaceous ke Paleocene-Eocene ? (2) apa yang mengatur ketidakteraturan
jarak rumpang palung-busur (ATG - arc trench gap). Sebab, Bayah Arc begitu dekat
dengan Ciletuh Trench, sementara Jatibarang Arc begitu jauh dari Luk Ulo trench.
Seolah-olah ATG ini membaji menyempit di SW Java dan semakin lebar ke arah Jawa Timur.
Apakah itu terjadi oleh mega-shear (transduction ?), megashear yang mana pada umur itu
yang menggeser ATG ? Di paper lain tentang tektonik Jawa Tengah (Structural
Indentation of Central Java : a strike-slip segmentation - publikasi khusus oleh IAGI
Pengda Yogya JAwa Tengah 2003), saya menaruh dua sesar mendatar besar yang mengapit
Jawa Tengah yang menyebabkan indentasi Jawa Tengah : sinistral Muria-Kebumen (arah
Meratus) dan dextral Pamanukan-Cilacap (arah Sumatra) yang umur2nya di sekitar
Early Tertiary, apakah sesar2 ini (yang keberadaannya terutama didasarkan pada
segmentasi data gayaberat) yang menyebabkan transduction, kelihatannya Pak Koesoema
memilih sesar lain dengan arah Jawa (B-T), seperti RMK (Rembang-Madura-Kangean),
tetapi itu jadinya harus dextral bila menggeser jalur trench ke Satanger, sementara
saat ini RMK sangat mengesankan sinistral, ini selanjutnya akan mengarah ke origin RMK
sendiri dan histori slip-nya.
Kelihatannya OAF (Old Andesite Formation) dan juga Jatibarang Formation batasannya
harus dilihat lagi. Tulisan tentang Jatibarang sangat sedikit, sehingga menyulitkan
sintesis regionalnya. Penertiban penamaan stratigrafi memang jadi salah satu agenda
Komisi Stratigrafi IAGI. Saya memulainya sejak tahun 2002 dengan menginformasikan ke
KPS2 yang terkait tentang penamaan ini, hanya memang belum kelihatan efeknya. Nama2
seperti Zelda, Gita, Banuwati telah lama dipakai sejak akhir 60an,
[PHP-CVS] cvs: php4 /ext/dba config.m4 dba.c dba_flatfile.c dba_flatile.c /ext/dba/libflatfile flatfile.c flatfile.h
helly Wed Nov 6 04:17:51 2002 EDT
Added files:
/php4/ext/dba dba_flatfile.c
Removed files:
/php4/ext/dba dba_flatile.c
Modified files:
/php4/ext/dba config.m4 dba.c
/php4/ext/dba/libflatfile flatfile.c flatfile.h
Log:
Use the the name 'flatfile' correctly so the handler support can be built now.
#I do not like the lock solution since a crashed php would leave the *lck
#file locked now.
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.26 php4/ext/dba/config.m4:1.27
--- php4/ext/dba/config.m4:1.26 Tue Nov 5 23:16:17 2002
+++ php4/ext/dba/config.m4 Wed Nov 6 04:17:50 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2002/11/06 04:16:17 helly Exp $
+dnl $Id: config.m4,v 1.27 2002/11/06 09:17:50 helly Exp $
dnl
AC_DEFUN(PHP_TEMP_LDFLAGS,[
@@ -246,7 +246,7 @@
if test $withval = yes; then
PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
AC_DEFINE(DBA_FLATFILE, 1, [ ])
-flat_sources=php_flatfile.c libflatfile/flatfile.c
+flat_sources=dba_flatfile.c libflatfile/flatfile.c
THIS_RESULT=builtin
fi
])
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.53 php4/ext/dba/dba.c:1.54
--- php4/ext/dba/dba.c:1.53 Tue Nov 5 23:16:17 2002
+++ php4/ext/dba/dba.c Wed Nov 6 04:17:50 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dba.c,v 1.53 2002/11/06 04:16:17 helly Exp $ */
+/* $Id: dba.c,v 1.54 2002/11/06 09:17:50 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -35,6 +35,7 @@
#include php_cdb.h
#include php_db2.h
#include php_db3.h
+#include php_flatfile.h
/* {{{ dba_functions[]
*/
Index: php4/ext/dba/libflatfile/flatfile.c
diff -u php4/ext/dba/libflatfile/flatfile.c:1.1 php4/ext/dba/libflatfile/flatfile.c:1.2
--- php4/ext/dba/libflatfile/flatfile.c:1.1 Tue Nov 5 23:16:18 2002
+++ php4/ext/dba/libflatfile/flatfile.c Wed Nov 6 04:17:51 2002
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: flatfile.c,v 1.1 2002/11/06 04:16:18 helly Exp $ */
+/* $Id: flatfile.c,v 1.2 2002/11/06 09:17:51 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,7 +36,7 @@
#include unistd.h
#endif
-#include dbm.h
+#include flatfile.h
/*
* ret = -1 means that database was opened for read-only
@@ -46,7 +46,7 @@
/* {{{ dbm_file_store
*/
-PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum, int
mode TSRMLS_DC) {
+PHPAPI int dbm_file_store(flatfile *dba, datum key_datum, datum value_datum, int mode
+TSRMLS_DC) {
if (mode == DBM_INSERT) {
if (dbm_file_findkey(dba, key_datum TSRMLS_CC)) {
return 1;
@@ -77,7 +77,7 @@
/* {{{ dbm_file_fetch
*/
-PHPAPI datum dbm_file_fetch(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
+PHPAPI datum dbm_file_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
datum value_datum = {NULL, 0};
int num=0, buf_size=1024;
char *buf;
@@ -105,7 +105,7 @@
/* {{{ dbm_file_delete
*/
-PHPAPI int dbm_file_delete(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
+PHPAPI int dbm_file_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
char *key = key_datum.dptr;
int size = key_datum.dsize;
@@ -164,7 +164,7 @@
/* {{{ dbm_file_findkey
*/
-PHPAPI int dbm_file_findkey(dba_dbm_data *dba, datum key_datum TSRMLS_DC) {
+PHPAPI int dbm_file_findkey(flatfile *dba, datum key_datum TSRMLS_DC) {
char *buf = NULL;
int num;
int buf_size=1024;
@@ -211,7 +211,7 @@
/* {{{ dbm_file_firstkey
*/
-PHPAPI datum dbm_file_firstkey(dba_dbm_data *dba TSRMLS_DC) {
+PHPAPI datum dbm_file_firstkey(flatfile *dba TSRMLS_DC) {
datum buf;
int num;
int buf_size=1024;
@@ -252,7 +252,7 @@
/* {{{ latfile_nextkey
*/
-PHPAPI datum dbm_file_nextkey(dba_dbm_data *dba TSRMLS_DC) {
+PHPAPI datum dbm_file_nextkey(flatfile *dba TSRMLS_DC) {
datum buf;
int num;
int buf_size=1024;
Index: php4/ext/dba/libflatfile/flatfile.h
diff -u php4/ext/dba/libflatfile/flatfile.h:1.1 php4/ext/dba/libflatfile/flatfile.h:1.2
--- php4/ext/dba/libflatfile/flatfile.h:1.1 Tue Nov 5 23:16:18 2002
+++ php4/ext/dba/libflatfile/flatfile.h Wed Nov 6 04:17:51 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: flatfile.h,v 1.1 2002/11/06 04:16:18 helly Exp $ */
+/* $Id: flatfile.h,v 1.2 2002/11/06 09:17:51 helly Exp $ */
#ifndef PHP_LIBDBM_H
#define PHP_LIBDBM_H
@@ -32,16 +32,16 @@
php_stream *fp;
long CurrentFlatFilePos;
datum nextkey;
-} dba_dbm_data;
+} flatfile;
#define DBM_INSERT 0
#define DBM_REPLACE 1
-PHPAPI int dbm_file_store(dba_dbm_data *dba, datum key_datum, datum value_datum, int
mode TSRMLS_DC);
-PHPAPI datum
[PHP-CVS] cvs: php4 /ext/dba config.m4
helly Wed Nov 6 05:08:38 2002 EDT Modified files: /php4/ext/dba config.m4 Log: There shall never be an external library for this (hopefully). Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.27 php4/ext/dba/config.m4:1.28 --- php4/ext/dba/config.m4:1.27 Wed Nov 6 04:17:50 2002 +++ php4/ext/dba/config.m4 Wed Nov 6 05:08:38 2002 -1,5 +1,5 dnl -dnl $Id: config.m4,v 1.27 2002/11/06 09:17:50 helly Exp $ +dnl $Id: config.m4,v 1.28 2002/11/06 10:08:38 helly Exp $ dnl AC_DEFUN(PHP_TEMP_LDFLAGS,[ -242,8 +242,8 AC_DBA_STD_RESULT AC_ARG_WITH(flatfile, -[ --with-flatfile[=DIR] Include FlatFile support],[ - if test $withval = yes; then +[ --with-flatfile Include FlatFile support],[ + if test $withval != no; then PHP_ADD_BUILD_DIR($ext_builddir/libflatfile) AC_DEFINE(DBA_FLATFILE, 1, [ ]) flat_sources=dba_flatfile.c libflatfile/flatfile.c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/curl config.m4
On 11/06/02, Wez Furlong [EMAIL PROTECTED] wrote: Modified files: /php4/ext/curlconfig.m4 Log: Disable --with-curlwrappers. (Pending support from libcurl itself) + PHP_CHECK_LIBRARY(curl,curl_version_info, + [ +AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ]) + ],[],[ $CURL_LIBS -L$CURL_DIR/lib ]) This part was committed by accident, but shouldn't hurt anyone. --Wez. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba dba_flatfile.c
helly Wed Nov 6 05:43:41 2002 EDT
Modified files:
/php4/ext/dba dba_flatfile.c
Log:
fix locks and reading
#i will extend the tests to guard on such failures
Index: php4/ext/dba/dba_flatfile.c
diff -u php4/ext/dba/dba_flatfile.c:1.1 php4/ext/dba/dba_flatfile.c:1.2
--- php4/ext/dba/dba_flatfile.c:1.1 Wed Nov 6 04:17:50 2002
+++ php4/ext/dba/dba_flatfile.c Wed Nov 6 05:43:41 2002
-16,7 +16,7
+--+
*/
-/* $Id: dba_flatfile.c,v 1.1 2002/11/06 09:17:50 helly Exp $ */
+/* $Id: dba_flatfile.c,v 1.2 2002/11/06 10:43:41 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-157,16 +157,16
{
DBM_DATA;
+ if (dba-lockfn) {
#if NFS_HACK
- VCWD_UNLINK(dba-lockfn);
+ VCWD_UNLINK(dba-lockfn);
#else
- if (dba-lockfn) {
/*dba-lockfd = VCWD_OPEN_MODE(dba-lockfn, O_RDWR, 0644);*/
flock(dba-lockfd, LOCK_UN);
close(dba-lockfd);
- }
#endif
- efree(dba-lockfn);
+ efree(dba-lockfn);
+ }
php_stream_close(dba-fp);
if (dba-nextkey.dptr)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/tests skipif.inc
helly Wed Nov 6 06:59:14 2002 EDT
Modified files:
/php4/ext/dba/tests skipif.inc
Log:
-convert from dos to unix file
-disallow cdb_make
Index: php4/ext/dba/tests/skipif.inc
diff -u php4/ext/dba/tests/skipif.inc:1.2 php4/ext/dba/tests/skipif.inc:1.3
--- php4/ext/dba/tests/skipif.inc:1.2 Sun Nov 3 10:22:32 2002
+++ php4/ext/dba/tests/skipif.inc Wed Nov 6 06:59:14 2002
-1,12 +1,15
-?php
- if (!extension_loaded('dba')) die('skip dba extension not available');
- if (!function_exists('dba_handlers')) die ('skip dba_handlers() not
available');
- if (!sizeof(dba_handlers())) die('skip no handlers installed');
- // CDB currently supports only reading
- $handler = dba_handlers();
- if ($handler[0]=='cdb') {
- if (count($handler)==1) {
- die('skip CDB currently supports only reading ');
- }
- }
-?
+?php
+ if (!extension_loaded('dba')) die('skip dba extension not available');
+ if (!function_exists('dba_handlers')) die ('skip dba_handlers() not
+available');
+ if (!sizeof(dba_handlers())) die('skip no handlers installed');
+ // CDB currently supports only reading
+ $handler = dba_handlers();
+ if ($handler[0]=='cdb') {
+ if (count($handler)==1) {
+ die('skip CDB currently supports only reading');
+ }
+ if ($handler[1]=='cdb_make' count($handler)==2) {
+ die('skip CDB currently supports only reading and creating');
+ }
+ }
+?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/tests dba_handler.inc test.inc
helly Wed Nov 6 07:01:38 2002 EDT
Modified files:
/php4/ext/dba/tests dba_handler.inc test.inc
Log:
-convert from dos to unix file
Index: php4/ext/dba/tests/dba_handler.inc
diff -u php4/ext/dba/tests/dba_handler.inc:1.2 php4/ext/dba/tests/dba_handler.inc:1.3
--- php4/ext/dba/tests/dba_handler.inc:1.2 Wed Nov 6 06:18:00 2002
+++ php4/ext/dba/tests/dba_handler.inc Wed Nov 6 07:01:36 2002
-1,61 +1,61
-?php
- echo database handler: $handler\n;
- if (($db_file=dba_open($db_filename, n, $handler))!==FALSE) {
- dba_insert(key1, Content String 1, $db_file);
- dba_insert(key2, Content String 2, $db_file);
- dba_insert(key3, Third Content String, $db_file);
- dba_insert(key4, Another Content String, $db_file);
- dba_insert(key5, The last content string, $db_file);
- dba_delete(key3, $db_file);
- dba_delete(key1, $db_file);
- $a = dba_firstkey($db_file);
- $i=0;
- while($a) {
- $a = dba_nextkey($db_file);
- $i++;
- }
- echo $i;
- for ($i=1; $i6; $i++) {
- echo dba_exists(key$i, $db_file) ? Y : N;
- }
- echo \n;
- echo dba_fetch(key2, $db_file).\n;
- dba_replace(key2, Content 2 replaced, $db_file);
- echo dba_fetch(key2, $db_file).\n;
- dba_close($db_file);
- } else {
- echo Error creating database\n;
- }
- $db_writer=dba_open($db_filename, w, $handler);
- if (($dba_reader=dba_open($db_filename, r, $handler))===false) {
- echo Cannot read during write operation\n;
- } else {
- echo Read during write permitted\n;
- }
- if ($db_writer!==FALSE) {
- dba_insert(key number 6, The 6th value, $db_writer);
- dba_replace(key2, Content 2 replaced 2nd time, $db_writer);
- dba_delete(key4, $db_writer);
- echo dba_fetch(key2, $db_writer).\n;
- echo dba_fetch(key number 6, $db_writer).\n;
- dba_close($db_writer); // when the writer is open at least db3 would
fail because of buffered io.
- } else {
- die(Error reopening database\n);
- }
- if (($db_file=dba_open($db_filename, r, $handler))!==FALSE) {
- $key = dba_firstkey($db_file);
- $res = array();
- while($key) {
- $res[$key] = dba_fetch($key, $db_file);
- $key = dba_nextkey($db_file);
- }
- ksort($res);
- var_dump($res);
- dba_close($db_file);
- } else {
- echo Error reading database\n;
- }
- if ($dba_reader) {
- dba_close($dba_reader);
- }
+?php
+ echo database handler: $handler\n;
+ if (($db_file=dba_open($db_filename, n, $handler))!==FALSE) {
+ dba_insert(key1, Content String 1, $db_file);
+ dba_insert(key2, Content String 2, $db_file);
+ dba_insert(key3, Third Content String, $db_file);
+ dba_insert(key4, Another Content String, $db_file);
+ dba_insert(key5, The last content string, $db_file);
+ dba_delete(key3, $db_file);
+ dba_delete(key1, $db_file);
+ $a = dba_firstkey($db_file);
+ $i=0;
+ while($a) {
+ $a = dba_nextkey($db_file);
+ $i++;
+ }
+ echo $i;
+ for ($i=1; $i6; $i++) {
+ echo dba_exists(key$i, $db_file) ? Y : N;
+ }
+ echo \n;
+ echo dba_fetch(key2, $db_file).\n;
+ dba_replace(key2, Content 2 replaced, $db_file);
+ echo dba_fetch(key2, $db_file).\n;
+ dba_close($db_file);
+ } else {
+ echo Error creating database\n;
+ }
+ $db_writer=dba_open($db_filename, w, $handler);
+ if (($dba_reader=dba_open($db_filename, r, $handler))===false) {
+ echo Cannot read during write operation\n;
+ } else {
+ echo Read during write permitted\n;
+ }
+ if ($db_writer!==FALSE) {
+ dba_insert(key number 6, The 6th value, $db_writer);
+ dba_replace(key2, Content 2 replaced 2nd time, $db_writer);
+ dba_delete(key4, $db_writer);
+ echo dba_fetch(key2, $db_writer).\n;
+ echo dba_fetch(key number 6, $db_writer).\n;
+ dba_close($db_writer); // when the writer is open at least db3 would
+fail because of buffered io.
+ } else {
+ die(Error reopening database\n);
+ }
+ if
[PHP-CVS] cvs: php4 /ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt
moriyoshi Wed Nov 6 10:06:35 2002 EDT
Modified files:
/php4/ext/standard/tests/stringshtmlentities02.phpt
htmlentities03.phpt
htmlentities04.phpt
Log:
Made skip conditions stricter.
Index: php4/ext/standard/tests/strings/htmlentities02.phpt
diff -u php4/ext/standard/tests/strings/htmlentities02.phpt:1.4
php4/ext/standard/tests/strings/htmlentities02.phpt:1.5
--- php4/ext/standard/tests/strings/htmlentities02.phpt:1.4 Sun Nov 3 03:37:59
2002
+++ php4/ext/standard/tests/strings/htmlentities02.phpt Wed Nov 6 10:06:35 2002
-1,7 +1,12
--TEST--
htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15)
--SKIPIF--
-?php setlocale(LC_CTYPE, fr_FR.ISO-8859-15, fr_FR.ISO8859-15) or die(skip
setlocale() failed\n); ?
+?php
+$result = (bool)setlocale(LC_CTYPE, fr_FR.ISO-8859-15, fr_FR.ISO8859-15);
+if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) {
+ die(skip setlocale() failed\n);
+}
+?
--INI--
output_handler=
mbstring.internal_encoding=pass
Index: php4/ext/standard/tests/strings/htmlentities03.phpt
diff -u php4/ext/standard/tests/strings/htmlentities03.phpt:1.4
php4/ext/standard/tests/strings/htmlentities03.phpt:1.5
--- php4/ext/standard/tests/strings/htmlentities03.phpt:1.4 Sun Nov 3 03:37:59
2002
+++ php4/ext/standard/tests/strings/htmlentities03.phpt Wed Nov 6 10:06:35 2002
-1,7 +1,12
--TEST--
htmlentities() test 3 (setlocale / de_DE.ISO-8859-1)
--SKIPIF--
-?php setlocale(LC_CTYPE, de_DE.ISO-8859-1, de_DE.ISO8859-1) or die(skip
setlocale() failed\n); ?
+?php
+$result = (bool)setlocale(LC_CTYPE, de_DE.ISO-8859-1, de_DE.ISO8859-1);
+if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) {
+ die(skip setlocale() failed\n);
+}
+?
--INI--
output_handler=
mbstring.internal_encoding=pass
Index: php4/ext/standard/tests/strings/htmlentities04.phpt
diff -u php4/ext/standard/tests/strings/htmlentities04.phpt:1.4
php4/ext/standard/tests/strings/htmlentities04.phpt:1.5
--- php4/ext/standard/tests/strings/htmlentities04.phpt:1.4 Sun Nov 3 03:37:59
2002
+++ php4/ext/standard/tests/strings/htmlentities04.phpt Wed Nov 6 10:06:35 2002
-1,7 +1,12
--TEST--
htmlentities() test 4 (setlocale / ja_JP.EUC-JP)
--SKIPIF--
-?php setlocale(LC_CTYPE, ja_JP.EUC-JP, ja_JP.eucJP) or die(skip setlocale()
failed\n); ?
+?php
+$result = (bool)setlocale(LC_CTYPE, ja_JP.EUC-JP, ja_JP.eucJP);
+if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) === false) {
+ die(skip setlocale() failed\n);
+}
+?
--INI--
output_handler=
mbstring.internal_encoding=pass
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt
moriyoshi Wed Nov 6 10:15:00 2002 EDT
Modified files:
/php4/ext/standard/tests/stringshtmlentities02.phpt
htmlentities03.phpt
htmlentities04.phpt
Log:
Oops, preg_match() returns integer value, not boolean.
Index: php4/ext/standard/tests/strings/htmlentities02.phpt
diff -u php4/ext/standard/tests/strings/htmlentities02.phpt:1.5
php4/ext/standard/tests/strings/htmlentities02.phpt:1.6
--- php4/ext/standard/tests/strings/htmlentities02.phpt:1.5 Wed Nov 6 10:06:35
2002
+++ php4/ext/standard/tests/strings/htmlentities02.phpt Wed Nov 6 10:14:58 2002
-3,7 +3,7
--SKIPIF--
?php
$result = (bool)setlocale(LC_CTYPE, fr_FR.ISO-8859-15, fr_FR.ISO8859-15);
-if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) {
+if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
die(skip setlocale() failed\n);
}
?
Index: php4/ext/standard/tests/strings/htmlentities03.phpt
diff -u php4/ext/standard/tests/strings/htmlentities03.phpt:1.5
php4/ext/standard/tests/strings/htmlentities03.phpt:1.6
--- php4/ext/standard/tests/strings/htmlentities03.phpt:1.5 Wed Nov 6 10:06:35
2002
+++ php4/ext/standard/tests/strings/htmlentities03.phpt Wed Nov 6 10:14:58 2002
-3,7 +3,7
--SKIPIF--
?php
$result = (bool)setlocale(LC_CTYPE, de_DE.ISO-8859-1, de_DE.ISO8859-1);
-if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) {
+if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
die(skip setlocale() failed\n);
}
?
Index: php4/ext/standard/tests/strings/htmlentities04.phpt
diff -u php4/ext/standard/tests/strings/htmlentities04.phpt:1.5
php4/ext/standard/tests/strings/htmlentities04.phpt:1.6
--- php4/ext/standard/tests/strings/htmlentities04.phpt:1.5 Wed Nov 6 10:06:35
2002
+++ php4/ext/standard/tests/strings/htmlentities04.phpt Wed Nov 6 10:14:58 2002
-3,7 +3,7
--SKIPIF--
?php
$result = (bool)setlocale(LC_CTYPE, ja_JP.EUC-JP, ja_JP.eucJP);
-if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) === false) {
+if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0) {
die(skip setlocale() failed\n);
}
?
--
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 Wed Nov 6 11:29:17 2002 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Fixed segfaults in case the specified encoding is not acceptable to iconv.
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.61 php4/ext/iconv/iconv.c:1.62
--- php4/ext/iconv/iconv.c:1.61 Wed Oct 30 14:21:56 2002
+++ php4/ext/iconv/iconv.c Wed Nov 6 11:29:16 2002
-17,7 +17,7
+--+
*/
-/* $Id: iconv.c,v 1.61 2002/10/30 19:21:56 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.62 2002/11/06 16:29:16 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-251,8 +251,10
if (cd == (iconv_t)(-1)) {
if (errno == EINVAL) {
+ *out = NULL;
return PHP_ICONV_ERR_WRONG_CHARSET;
} else {
+ *out = NULL;
return PHP_ICONV_ERR_CONVERTER;
}
}
-263,11 +265,11
out_buf = (char *) emalloc(bsz+1);
out_p = out_buf;
- while(in_left 0) {
+ while (in_left 0) {
result = icv(cd, (const char **) in_p, in_left, (char **) out_p,
out_left);
out_size = bsz - out_left;
- if( result == (size_t)(-1) ) {
- if( errno == E2BIG in_left 0 ) {
+ if (result == (size_t)(-1)) {
+ if (errno == E2BIG in_left 0) {
/* converted string is longer than out buffer */
bsz += in_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv/tests iconv002.phpt
moriyoshi Wed Nov 6 11:37:11 2002 EDT
Modified files:
/php4/ext/iconv/tests iconv002.phpt
Log:
Stricter SKIPIF conditions
Index: php4/ext/iconv/tests/iconv002.phpt
diff -u php4/ext/iconv/tests/iconv002.phpt:1.3 php4/ext/iconv/tests/iconv002.phpt:1.4
--- php4/ext/iconv/tests/iconv002.phpt:1.3 Tue Oct 29 11:25:23 2002
+++ php4/ext/iconv/tests/iconv002.phpt Wed Nov 6 11:37:10 2002
-1,7 +1,12
--TEST--
UCS4BE to ASCII
--SKIPIF--
-?php /* include('skipif.inc'); */ ?
+?php
+/* include('skipif.inc'); */
+if (iconv(ascii,UCS-4LE, abcd) == '') {
+ die(skip conversion to UCS-4LE not supported);
+}
+?
--INI--
error_reporting=2039
--FILE--
--
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 Wed Nov 6 11:54:18 2002 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Clean up
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.62 php4/ext/iconv/iconv.c:1.63
--- php4/ext/iconv/iconv.c:1.62 Wed Nov 6 11:29:16 2002
+++ php4/ext/iconv/iconv.c Wed Nov 6 11:54:18 2002
-17,7 +17,7
+--+
*/
-/* $Id: iconv.c,v 1.62 2002/11/06 16:29:16 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.63 2002/11/06 16:54:18 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-197,7 +197,8
size_t result;
typedef unsigned int ucs4_t;
- in_size = in_len;
+ *out = NULL;
+ *out_len = 0;
/*
This is not the right way to get output size...
-208,17 +209,16
*/
out_size = in_len * sizeof(ucs4_t) + 15;
out_left = out_size;
-
+
+ in_size = in_len;
+
cd = icv_open(out_charset, in_charset);
if (cd == (iconv_t)(-1)) {
- *out = NULL;
- *out_len = 0;
return PHP_ICONV_ERR_UNKNOWN;
}
out_buffer = (char *) emalloc(out_size + 1);
- *out = out_buffer;
out_p = out_buffer;
result = icv(cd, (const char **) in_p, in_size, (char **)
-226,15 +226,15
if (result == (size_t)(-1)) {
efree(out_buffer);
- *out = NULL;
- *out_len = 0;
return PHP_ICONV_ERR_UNKNOWN;
}
*out_len = out_size - out_left;
out_buffer[*out_len] = '\0';
+ *out = out_buffer;
+
icv_close(cd);
-
+
return PHP_ICONV_ERR_SUCCESS;
#else
-247,14 +247,15
size_t bsz, result = 0;
php_iconv_err_t retval = PHP_ICONV_ERR_SUCCESS;
+ *out = NULL;
+ *out_len = 0;
+
cd = icv_open(out_charset, in_charset);
if (cd == (iconv_t)(-1)) {
if (errno == EINVAL) {
- *out = NULL;
return PHP_ICONV_ERR_WRONG_CHARSET;
} else {
- *out = NULL;
return PHP_ICONV_ERR_CONVERTER;
}
}
-305,8 +306,6
/* other error */
retval = PHP_ICONV_ERR_UNKNOWN;
efree(out_buf);
- *out = NULL;
- *out_len = 0;
return PHP_ICONV_ERR_UNKNOWN;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dbx/tests 005.phpt
helly Wed Nov 6 11:56:44 2002 EDT Modified files: /php4/ext/dbx/tests 005.phpt Log: added missing magic_quotes_runtime=0 Index: php4/ext/dbx/tests/005.phpt diff -u php4/ext/dbx/tests/005.phpt:1.8 php4/ext/dbx/tests/005.phpt:1.9 --- php4/ext/dbx/tests/005.phpt:1.8 Mon Oct 28 04:41:15 2002 +++ php4/ext/dbx/tests/005.phpt Wed Nov 6 11:56:44 2002 -4,6 +4,8 ?php include_once(skipif.inc); ? +--INI-- +magic_quotes_runtime=0 --FILE-- ?php include_once(dbx_test.p); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv/tests iconv003.phpt
moriyoshi Wed Nov 6 11:57:54 2002 EDT
Added files:
/php4/ext/iconv/tests iconv003.phpt
Log:
Added a test case to check the behaviour on failure
Index: php4/ext/iconv/tests/iconv003.phpt
+++ php4/ext/iconv/tests/iconv003.phpt
--TEST--
iconv() test 3
--FILE--
?php
for ($i = 0; $i 3; ++$i) {
if (iconv('blah', 'blah', 'blah') != '') {
die(failed\n);
}
}
echo success\n;
?
--EXPECT--
success
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv/tests iconv001.phpt iconv002.phpt ob_iconv_handler.phpt
moriyoshi Wed Nov 6 11:58:08 2002 EDT
Modified files:
/php4/ext/iconv/tests iconv001.phpt iconv002.phpt
ob_iconv_handler.phpt
Log:
Cosmetics
Index: php4/ext/iconv/tests/iconv001.phpt
diff -u php4/ext/iconv/tests/iconv001.phpt:1.3 php4/ext/iconv/tests/iconv001.phpt:1.4
--- php4/ext/iconv/tests/iconv001.phpt:1.3 Tue Oct 29 11:25:23 2002
+++ php4/ext/iconv/tests/iconv001.phpt Wed Nov 6 11:58:08 2002
-1,5 +1,5
--TEST--
-iconv test
+iconv() test 1
--SKIPIF--
?php /* include('skipif.inc'); */ ?
--INI--
Index: php4/ext/iconv/tests/iconv002.phpt
diff -u php4/ext/iconv/tests/iconv002.phpt:1.4 php4/ext/iconv/tests/iconv002.phpt:1.5
--- php4/ext/iconv/tests/iconv002.phpt:1.4 Wed Nov 6 11:37:10 2002
+++ php4/ext/iconv/tests/iconv002.phpt Wed Nov 6 11:58:08 2002
-1,5 +1,5
--TEST--
-UCS4BE to ASCII
+iconv() test 2 (UCS4BE to ASCII)
--SKIPIF--
?php
/* include('skipif.inc'); */
Index: php4/ext/iconv/tests/ob_iconv_handler.phpt
diff -u php4/ext/iconv/tests/ob_iconv_handler.phpt:1.3
php4/ext/iconv/tests/ob_iconv_handler.phpt:1.4
--- php4/ext/iconv/tests/ob_iconv_handler.phpt:1.3 Tue Oct 29 11:25:23 2002
+++ php4/ext/iconv/tests/ob_iconv_handler.phpt Wed Nov 6 11:58:08 2002
-1,5 +1,5
--TEST--
-ob_output_handler
+ob_iconv_handler()
--SKIPIF--
?php /* include('skipif.inc'); */ ?
--INI--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/thttpd thttpd_patch
sas Wed Nov 6 12:31:04 2002 EDT
Modified files:
/php4/sapi/thttpd thttpd_patch
Log:
- use TCP_DEFER_ACCEPT
- don't timeout connections which are managed by IRCG
- don't generate invalid HTTP replies, if the client did not send a
request line yet
Index: php4/sapi/thttpd/thttpd_patch
diff -u php4/sapi/thttpd/thttpd_patch:1.29 php4/sapi/thttpd/thttpd_patch:1.30
--- php4/sapi/thttpd/thttpd_patch:1.29 Fri Nov 1 06:51:35 2002
+++ php4/sapi/thttpd/thttpd_patch Wed Nov 6 12:31:03 2002
-1,6 +1,6
diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
--- thttpd-2.21b/Makefile.in Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in Fri Nov 1 12:43:16 2002
thttpd-2.21b-cool/Makefile.in Fri Nov 1 13:15:14 2002
-46,13 +46,15
# You shouldn't need to edit anything below here.
-49,7 +49,7
name=`sed -n -e '/SERVER_SOFTWARE/!d' -e 's,.*thttpd/,thttpd-,' -e 's, .*,,p'
version.h` ; \
diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
--- thttpd-2.21b/config.h Mon Apr 9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Fri Nov 1 12:43:16 2002
thttpd-2.21b-cool/config.h Fri Nov 1 13:15:14 2002
-82,6 +82,11
*/
#define IDLE_READ_TIMELIMIT 60
-71,9 +71,33
/* CONFIGURE: If this is defined then thttpd will automatically generate
** index pages for directories that don't have an explicit index file.
+diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
+--- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
thttpd-2.21b-cool/configureWed Nov 6 18:28:05 2002
+ -1021,7 +1021,7
+ fi
+ echo $ac_t$CPP 16
+
+-for ac_hdr in fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/event.h
+osreldate.h
++for ac_hdr in fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/event.h
+osreldate.h netinet/tcp.h
+ do
+ ac_safe=`echo $ac_hdr | sed 'y%./+-%__p_%'`
+ echo $ac_n checking for $ac_hdr... $ac_c 16
+diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
+--- thttpd-2.21b/configure.in Sat Apr 21 02:06:23 2001
thttpd-2.21b-cool/configure.in Wed Nov 6 18:25:00 2002
+ -64,7 +64,7
+ AC_MSG_RESULT(no)
+ fi
+
+-AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/event.h
+osreldate.h)
++AC_CHECK_HEADERS(fcntl.h grp.h memory.h paths.h poll.h sys/poll.h sys/event.h
+osreldate.h netinet/tcp.h)
+ AC_HEADER_TIME
+ AC_HEADER_DIRENT
+
diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
--- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cFri Nov 1 12:43:16 2002
thttpd-2.21b-cool/fdwatch.cWed Nov 6 18:20:53 2002
-460,7 +460,7
ridx = 0;
-96,8 +120,19
}
diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
--- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c Fri Nov 1 12:43:44 2002
- -85,6 +85,12
thttpd-2.21b-cool/libhttpd.c Wed Nov 6 18:29:07 2002
+ -56,6 +56,10
+ #include unistd.h
+ #include stdarg.h
+
++#ifdef HAVE_NETINET_TCP_H
++#include netinet/tcp.h
++#endif
++
+ #ifdef HAVE_OSRELDATE_H
+ #include osreldate.h
+ #endif /* HAVE_OSRELDATE_H */
+ -85,6 +89,12
#include match.h
#include tdate_parse.h
-110,7 +145,7
#ifndef STDIN_FILENO
#define STDIN_FILENO 0
#endif
- -242,6 +248,10
+ -242,6 +252,10
free( (void*) hs-cwd );
if ( hs-cgi_pattern != (char*) 0 )
free( (void*) hs-cgi_pattern );
-121,7 +156,7
if ( hs-charset != (char*) 0 )
free( (void*) hs-charset );
if ( hs-url_pattern != (char*) 0 )
- -249,6 +259,7
+ -249,6 +263,7
if ( hs-local_pattern != (char*) 0 )
free( (void*) hs-local_pattern );
free( (void*) hs );
-129,7 +164,7
}
- -257,7 +268,8
+ -257,7 +272,8
char* hostname, httpd_sockaddr* sa4P, httpd_sockaddr* sa6P, int port,
char* cgi_pattern, char* charset, char* cwd, int no_log, FILE* logfp,
int no_symlink, int vhost, int global_passwd, char* url_pattern,
-139,7 +174,7
{
httpd_server* hs;
static char ghnbuf[256];
- -312,6 +324,8
+ -312,6 +328,8
}
hs-port = port;
-148,7 +183,7
if ( cgi_pattern == (char*) 0 )
hs-cgi_pattern = (char*) 0;
else
- -329,7 +343,7
+ -329,7 +347,7
while ( ( cp = strstr( hs-cgi_pattern, |/ ) ) != (char*) 0 )
(void) strcpy( cp + 1, cp + 2 );
}
-157,7 +192,7
hs-cwd = strdup( cwd );
if ( hs-cwd == (char*) 0 )
{
- -385,6 +399,8
+ -385,6 +403,8
return (httpd_server*) 0;
}
-166,7 +201,19
/* Done initializing. */
if ( hs-binding_hostname == (char*) 0 )
syslog( LOG_INFO, %.80s starting on port %d, SERVER_SOFTWARE, hs-port );
- -582,6 +598,9
+ -418,6 +438,11
+ }
+ (void) fcntl( listen_fd, F_SETFD, 1 );
+
++#if defined(TCP_DEFER_ACCEPT) defined(SOL_TCP)
++ on = 30; /*
[PHP-CVS] cvs: php4 /ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c
sas Wed Nov 6 12:59:04 2002 EDT
Modified files:
/php4/ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c
dba_flatfile.c dba_gdbm.c dba_ndbm.c
Log:
emalloc never returns 0, so we can simplify the code paths.
also replace ecalloc with emalloc+memset, so that the latter can be inlined.
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.54 php4/ext/dba/dba.c:1.55
--- php4/ext/dba/dba.c:1.54 Wed Nov 6 04:17:50 2002
+++ php4/ext/dba/dba.c Wed Nov 6 12:59:03 2002
-16,7 +16,7
+--+
*/
-/* $Id: dba.c,v 1.54 2002/11/06 09:17:50 helly Exp $ */
+/* $Id: dba.c,v 1.55 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-369,12 +369,12
RETURN_FALSE;
}
- info = ecalloc(sizeof(dba_info), 1);
+ info = emalloc(sizeof(dba_info));
+ memset(info, 0, sizeof(dba_info));
info-path = estrdup(Z_STRVAL_PP(args[0]));
info-mode = modenr;
info-argc = ac - 3;
info-argv = args + 3;
- /* info-hnd is NULL here */
if (hptr-open(info, error TSRMLS_CC) != SUCCESS) {
dba_close(info TSRMLS_CC);
Index: php4/ext/dba/dba_cdb.c
diff -u php4/ext/dba/dba_cdb.c:1.20 php4/ext/dba/dba_cdb.c:1.21
--- php4/ext/dba/dba_cdb.c:1.20 Tue Nov 5 09:46:35 2002
+++ php4/ext/dba/dba_cdb.c Wed Nov 6 12:59:03 2002
-17,7 +17,7
+--+
*/
-/* $Id: dba_cdb.c,v 1.20 2002/11/05 14:46:35 helly Exp $ */
+/* $Id: dba_cdb.c,v 1.21 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-104,17 +104,8
return FAILURE;
}
- cdb = ecalloc(sizeof(dba_cdb), 1);
- if (!cdb) {
- pinfo-dbf = cdb;
-#if DBA_CDB_BUILTIN
- php_stream_close(file);
-#else
- close(file);
-#endif
- *error = Out of memory;
- return FAILURE;
- }
+ cdb = emalloc(sizeof(dba_cdb));
+ memset(cdb, 0, sizeof(dba_cdb));
#if DBA_CDB_BUILTIN
if (make) {
Index: php4/ext/dba/dba_db2.c
diff -u php4/ext/dba/dba_db2.c:1.29 php4/ext/dba/dba_db2.c:1.30
--- php4/ext/dba/dba_db2.c:1.29 Tue Nov 5 09:46:35 2002
+++ php4/ext/dba/dba_db2.c Wed Nov 6 12:59:03 2002
-16,7 +16,7
+--+
*/
-/* $Id: dba_db2.c,v 1.29 2002/11/05 14:46:35 helly Exp $ */
+/* $Id: dba_db2.c,v 1.30 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-76,11 +76,8
return FAILURE;
}
- info-dbf = ecalloc(sizeof(dba_db2_data), 1);
- if (!info-dbf) {
- *error = Out of memory;
- return FAILURE;
- }
+ info-dbf = emalloc(sizeof(dba_db2_data));
+ memset(info-dbf, 0, sizeof(dba_db2_data));
((dba_db2_data *) info-dbf)-dbp = dbp;
return SUCCESS;
}
Index: php4/ext/dba/dba_db3.c
diff -u php4/ext/dba/dba_db3.c:1.20 php4/ext/dba/dba_db3.c:1.21
--- php4/ext/dba/dba_db3.c:1.20 Tue Nov 5 09:46:36 2002
+++ php4/ext/dba/dba_db3.c Wed Nov 6 12:59:03 2002
-16,7 +16,7
+--+
*/
-/* $Id: dba_db3.c,v 1.20 2002/11/05 14:46:36 helly Exp $ */
+/* $Id: dba_db3.c,v 1.21 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-78,10 +78,6
dba_db3_data *data;
data = emalloc(sizeof(*data));
- if (!data) {
- *error = Out of memory;
- return FAILURE;
- }
data-dbp = dbp;
data-cursor = NULL;
info-dbf = data;
Index: php4/ext/dba/dba_dbm.c
diff -u php4/ext/dba/dba_dbm.c:1.21 php4/ext/dba/dba_dbm.c:1.22
--- php4/ext/dba/dba_dbm.c:1.21 Tue Nov 5 23:16:17 2002
+++ php4/ext/dba/dba_dbm.c Wed Nov 6 12:59:03 2002
-16,7 +16,7
+--+
*/
-/* $Id: dba_dbm.c,v 1.21 2002/11/06 04:16:17 helly Exp $ */
+/* $Id: dba_dbm.c,v 1.22 2002/11/06 17:59:03 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-78,11 +78,8
return FAILURE;
}
- info-dbf = ecalloc(sizeof(dba_dbm_data), 1);
- if (!info-dbf) {
- *error = Out of memory;
- return FAILURE;
- }
+ info-dbf = emalloc(sizeof(dba_dbm_data));
+ memset(info-dbf, 0, sizeof(dba_dbm_data));
return SUCCESS;
}
Index: php4/ext/dba/dba_flatfile.c
diff -u php4/ext/dba/dba_flatfile.c:1.2 php4/ext/dba/dba_flatfile.c:1.3
--- php4/ext/dba/dba_flatfile.c:1.2 Wed Nov 6 05:43:41 2002
+++ php4/ext/dba/dba_flatfile.c Wed Nov 6 12:59:03 2002
-16,7 +16,7
