[PHP-CVS] cvs: php-src /ext/dba/libflatfile flatfile.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 15:24:00 2006 UTC

  Modified files:  
/php-src/ext/dba/libflatfileflatfile.c 
  Log:
  use the macro, casting works only with GCC
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/libflatfile/flatfile.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/dba/libflatfile/flatfile.c
diff -u php-src/ext/dba/libflatfile/flatfile.c:1.17 
php-src/ext/dba/libflatfile/flatfile.c:1.18
--- php-src/ext/dba/libflatfile/flatfile.c:1.17 Thu May 11 20:08:45 2006
+++ php-src/ext/dba/libflatfile/flatfile.c  Thu Dec 28 15:24:00 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: flatfile.c,v 1.17 2006/05/11 20:08:45 helly Exp $ */
+/* $Id: flatfile.c,v 1.18 2006/12/28 15:24:00 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -37,7 +37,7 @@
 
 #include flatfile.h
 
-#define _php_stream_gets(stream, buf, len) php_stream_gets(stream, 
(zstr)((char*)buf), len)
+#define _php_stream_gets(stream, buf, len) php_stream_gets(stream, 
ZSTR(((char*)buf)), len)
 
 #define FLATFILE_BLOCK_SIZE 1024
 
@@ -308,7 +308,7 @@
 /* {{{ flatfile_version */
 char *flatfile_version() 
 {
-   return 1.0, $Revision: 1.17 $;
+   return 1.0, $Revision: 1.18 $;
 }
 /* }}} */ 
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/dba/libflatfile flatfile.c

2006-05-11 Thread Marcus Boerger 
helly   Thu May 11 20:08:45 2006 UTC

  Modified files:  
/php-src/ext/dba/libflatfileflatfile.c 
  Log:
  - Fix build
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/dba/libflatfile/flatfile.c?r1=1.16r2=1.17diff_format=u
Index: php-src/ext/dba/libflatfile/flatfile.c
diff -u php-src/ext/dba/libflatfile/flatfile.c:1.16 
php-src/ext/dba/libflatfile/flatfile.c:1.17
--- php-src/ext/dba/libflatfile/flatfile.c:1.16 Sun Feb 19 18:20:51 2006
+++ php-src/ext/dba/libflatfile/flatfile.c  Thu May 11 20:08:45 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: flatfile.c,v 1.16 2006/02/19 18:20:51 iliaa Exp $ */
+/* $Id: flatfile.c,v 1.17 2006/05/11 20:08:45 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -37,6 +37,8 @@
 
 #include flatfile.h
 
+#define _php_stream_gets(stream, buf, len) php_stream_gets(stream, 
(zstr)((char*)buf), len)
+
 #define FLATFILE_BLOCK_SIZE 1024
 
 /*
@@ -88,7 +90,7 @@
char buf[16];
 
if (flatfile_findkey(dba, key_datum TSRMLS_CC)) {
-   if (php_stream_gets(dba-fp, buf, sizeof(buf))) {
+   if (_php_stream_gets(dba-fp, buf, sizeof(buf))) {
value_datum.dsize = atoi(buf);
value_datum.dptr = safe_emalloc(value_datum.dsize, 1, 
1);
value_datum.dsize = php_stream_read(dba-fp, 
value_datum.dptr, value_datum.dsize);
@@ -114,7 +116,7 @@
php_stream_rewind(dba-fp);
while(!php_stream_eof(dba-fp)) {
/* read in the length of the key name */
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -140,7 +142,7 @@
}   
 
/* read in the length of the value */
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -171,7 +173,7 @@
 
php_stream_rewind(dba-fp);
while (!php_stream_eof(dba-fp)) {
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -189,7 +191,7 @@
break;
}
}   
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -217,7 +219,7 @@
 
php_stream_rewind(dba-fp);
while(!php_stream_eof(dba-fp)) {
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -235,7 +237,7 @@
res.dsize = num;
return res;
}
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -265,7 +267,7 @@
 
php_stream_seek(dba-fp, dba-CurrentFlatFilePos, SEEK_SET);
while(!php_stream_eof(dba-fp)) {
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -277,7 +279,7 @@
if (num  0)  {
break;
}
-   if (!php_stream_gets(dba-fp, buf, 15)) {
+   if (!_php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
@@ -306,7 +308,7 @@
 /* {{{ flatfile_version */
 char *flatfile_version() 
 {
-   return 1.0, $Revision: 1.16 $;
+   return 1.0, $Revision: 1.17 $;
 }
 /* }}} */ 
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/dba/libflatfile flatfile.c /ext/dba/libinifile inifile.c /ext/dbase dbase.c /ext/filepro filepro.c /ext/standard/tests/file bug22414.phpt

2006-02-19 Thread Ilia Alshanetsky 
iliaa   Sun Feb 19 18:20:51 2006 UTC

  Modified files:  
/php-src/ext/dbase  dbase.c 
/php-src/ext/dba/libinifile inifile.c 
/php-src/ext/dba/libflatfileflatfile.c 
/php-src/ext/fileprofilepro.c 
/php-src/ext/standard/tests/filebug22414.phpt 
  Log:
  More safe_mode nuking
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/dbase/dbase.c?r1=1.77r2=1.78diff_format=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.77 php-src/ext/dbase/dbase.c:1.78
--- php-src/ext/dbase/dbase.c:1.77  Sun Feb 19 00:55:19 2006
+++ php-src/ext/dbase/dbase.c   Sun Feb 19 18:20:51 2006
@@ -16,14 +16,13 @@
+--+
  */
 
-/* $Id: dbase.c,v 1.77 2006/02/19 00:55:19 andi Exp $ */
+/* $Id: dbase.c,v 1.78 2006/02/19 18:20:51 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
 #endif
 
 #include php.h
-#include safe_mode.h
 #include fopen_wrappers.h
 #include php_globals.h
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/dba/libinifile/inifile.c?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/dba/libinifile/inifile.c
diff -u php-src/ext/dba/libinifile/inifile.c:1.15 
php-src/ext/dba/libinifile/inifile.c:1.16
--- php-src/ext/dba/libinifile/inifile.c:1.15   Sun Jan  1 13:09:49 2006
+++ php-src/ext/dba/libinifile/inifile.cSun Feb 19 18:20:51 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: inifile.c,v 1.15 2006/01/01 13:09:49 sniper Exp $ */
+/* $Id: inifile.c,v 1.16 2006/02/19 18:20:51 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -24,7 +24,6 @@
 
 #include php.h
 #include php_globals.h
-#include safe_mode.h
 
 #include stdlib.h
 #include string.h
@@ -43,7 +42,7 @@
 /* {{{ inifile_version */
 char *inifile_version() 
 {
-   return 1.0, $Revision: 1.15 $;
+   return 1.0, $Revision: 1.16 $;
 }
 /* }}} */ 
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/dba/libflatfile/flatfile.c?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/dba/libflatfile/flatfile.c
diff -u php-src/ext/dba/libflatfile/flatfile.c:1.15 
php-src/ext/dba/libflatfile/flatfile.c:1.16
--- php-src/ext/dba/libflatfile/flatfile.c:1.15 Sun Jan  1 13:09:49 2006
+++ php-src/ext/dba/libflatfile/flatfile.c  Sun Feb 19 18:20:51 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: flatfile.c,v 1.15 2006/01/01 13:09:49 sniper Exp $ */
+/* $Id: flatfile.c,v 1.16 2006/02/19 18:20:51 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,7 +27,6 @@
 
 #include php.h
 #include php_globals.h
-#include safe_mode.h
 
 #include stdlib.h
 #include string.h
@@ -307,7 +306,7 @@
 /* {{{ flatfile_version */
 char *flatfile_version() 
 {
-   return 1.0, $Revision: 1.15 $;
+   return 1.0, $Revision: 1.16 $;
 }
 /* }}} */ 
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/filepro/filepro.c?r1=1.60r2=1.61diff_format=u
Index: php-src/ext/filepro/filepro.c
diff -u php-src/ext/filepro/filepro.c:1.60 php-src/ext/filepro/filepro.c:1.61
--- php-src/ext/filepro/filepro.c:1.60  Sun Feb 19 00:55:19 2006
+++ php-src/ext/filepro/filepro.c   Sun Feb 19 18:20:51 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: filepro.c,v 1.60 2006/02/19 00:55:19 andi Exp $ */
+/* $Id: filepro.c,v 1.61 2006/02/19 18:20:51 iliaa Exp $ */
 
 /*
   filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -31,7 +31,6 @@
 #endif
 
 #include php.h
-#include safe_mode.h
 #include fopen_wrappers.h
 #include string.h
 #if HAVE_SYS_PARAM_H
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/bug22414.phpt?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/standard/tests/file/bug22414.phpt
diff -u php-src/ext/standard/tests/file/bug22414.phpt:1.10 
php-src/ext/standard/tests/file/bug22414.phpt:1.11
--- php-src/ext/standard/tests/file/bug22414.phpt:1.10  Fri Oct 24 03:31:54 2003
+++ php-src/ext/standard/tests/file/bug22414.phpt   Sun Feb 19 18:20:51 2006
@@ -1,7 +1,6 @@
 --TEST--
 Bug #22414 (passthru() does not read data correctly)
 --INI--
-safe_mode=
 output_handler=
 --FILE--
 ?php

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php