cvs: php-src /main/streams streams.c
| From: | Jon Parise | Date: | Mon, 01 Mar 2004 07:02:24 +0000 |
| Subject: | cvs: php-src /main/streams streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26452@lists.php.net to get a copy of this message | ||
jon Mon Mar 1 02:02:24 2004 EDT
Modified files:
/php-src/main/streams streams.c
Log:
Cast the php_stream_dirent to a 'const char *' for estrndup() to avoid a
compiler warning.
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.49&r2=1.50&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.49 php-src/main/streams/streams.c:1.50
--- php-src/main/streams/streams.c:1.49 Wed Feb 4 17:46:44 2004
+++ php-src/main/streams/streams.c Mon Mar 1 02:02:23 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.49 2004/02/04 22:46:44 wez Exp $ */
+/* $Id: streams.c,v 1.50 2004/03/01 07:02:23 jon Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1881,7 +1881,7 @@
vector = (php_stream_dirent **) erealloc(vector, vector_size * sizeof(php_stream_dirent *));
}
- vector[nfiles++] = (php_stream_dirent*)estrndup(&sdp, sizeof(php_stream_dirent) +
((strlen(sdp.d_name) + 1) * sizeof(char)));
+ vector[nfiles++] = (php_stream_dirent*)estrndup((const char *)&sdp, sizeof(php_stream_dirent)
+ ((strlen(sdp.d_name) + 1) * sizeof(char)));
}
php_stream_closedir(stream);