sas Thu Aug 28 12:28:34 2003 EDT
Modified files:
/php-src/ext/standard exec.c filters.c fsock.c ftp_fopen_wrapper.c
http_fopen_wrapper.c var.c
Log:
kill warnings
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.103 php-src/ext/standard/exec.c:1.104
--- php-src/ext/standard/exec.c:1.103 Mon Aug 11 19:16:53 2003
+++ php-src/ext/standard/exec.c Thu Aug 28 12:28:33 2003
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.103 2003/08/11 23:16:53 iliaa Exp $ */
+/* $Id: exec.c,v 1.104 2003/08/28 16:28:33 sas Exp $ */
#include <stdio.h>
#include "php.h"
@@ -79,7 +79,7 @@
goto err;
}
b = strrchr(cmd, PHP_DIR_SEPARATOR);
- spprintf(&d, 0, "%s%s%s%s", PG(safe_mode_exec_dir), (b ? "" : "/"), (b
? b : cmd), (c ? " " : ""), (c ? c : ""));
+ spprintf(&d, 0, "%s%s%s%s%s", PG(safe_mode_exec_dir), (b ? "" : "/"),
(b ? b : cmd), (c ? " " : ""), (c ? c : ""));
if (c) {
*(c - 1) = ' ';
}
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.34 php-src/ext/standard/filters.c:1.35
--- php-src/ext/standard/filters.c:1.34 Tue Jun 10 16:03:37 2003
+++ php-src/ext/standard/filters.c Thu Aug 28 12:28:33 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filters.c,v 1.34 2003/06/10 20:03:37 imajes Exp $ */
+/* $Id: filters.c,v 1.35 2003/08/28 16:28:33 sas Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1181,6 +1181,7 @@
return PHP_CONV_ERR_SUCCESS;
}
+#if IT_WAS_USED
static php_conv_err_t php_conv_get_long_prop_ex(const HashTable *ht, long *pretval,
char *field_name, size_t field_name_len)
{
zval **tmpval;
@@ -1202,6 +1203,7 @@
}
return PHP_CONV_ERR_SUCCESS;
}
+#endif
static php_conv_err_t php_conv_get_ulong_prop_ex(const HashTable *ht, unsigned long
*pretval, char *field_name, size_t field_name_len)
{
@@ -1252,6 +1254,7 @@
}
+#if IT_WAS_USED
static int php_conv_get_int_prop_ex(const HashTable *ht, int *pretval, char
*field_name, size_t field_name_len)
{
long l;
@@ -1264,6 +1267,7 @@
}
return err;
}
+#endif
static int php_conv_get_uint_prop_ex(const HashTable *ht, unsigned int *pretval, char
*field_name, size_t field_name_len)
{
@@ -1661,7 +1665,7 @@
php_stream_filter *retval = NULL;
char *dot;
- int conv_mode;
+ int conv_mode = 0;
if (filterparams != NULL && Z_TYPE_P(filterparams) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream filter (%s):
invalid filter parameter", filtername);
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.114 php-src/ext/standard/fsock.c:1.115
--- php-src/ext/standard/fsock.c:1.114 Thu Aug 28 11:16:20 2003
+++ php-src/ext/standard/fsock.c Thu Aug 28 12:28:33 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.114 2003/08/28 15:16:20 sas Exp $ */
+/* $Id: fsock.c,v 1.115 2003/08/28 16:28:33 sas Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -56,7 +56,7 @@
}
if (port > 0) {
- hostname_len = spprintf(&hostname, 0, "%s:%d", host, port);
+ hostname_len = spprintf(&hostname, 0, "%s:%ld", host, port);
} else {
hostname_len = host_len;
hostname = host;
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.61
php-src/ext/standard/ftp_fopen_wrapper.c:1.62
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.61 Mon Aug 25 18:25:33 2003
+++ php-src/ext/standard/ftp_fopen_wrapper.c Thu Aug 28 12:28:33 2003
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.61 2003/08/25 22:25:33 pollita Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.62 2003/08/28 16:28:33 sas Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -477,7 +477,7 @@
php_stream_context_get_option(context, "ftp", "resume_pos",
&tmpzval) == SUCCESS &&
Z_TYPE_PP(tmpzval) == IS_LONG &&
Z_LVAL_PP(tmpzval) > 0) {
- snprintf(tmp_line, 511, "REST %u\r\n", Z_LVAL_PP(tmpzval));
+ snprintf(tmp_line, 511, "REST %ld\r\n", Z_LVAL_PP(tmpzval));
php_stream_write_string(stream, tmp_line);
result = GET_FTP_RESULT(stream);
if (result < 300 || result > 399) {
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.75
php-src/ext/standard/http_fopen_wrapper.c:1.76
--- php-src/ext/standard/http_fopen_wrapper.c:1.75 Fri Jun 13 15:27:26 2003
+++ php-src/ext/standard/http_fopen_wrapper.c Thu Aug 28 12:28:33 2003
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.75 2003/06/13 19:27:26 pollita Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.76 2003/08/28 16:28:33 sas Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -103,7 +103,7 @@
char *http_header_line = NULL;
char tmp_line[128];
size_t chunk_size = 0, file_size = 0;
- int eol_detect;
+ int eol_detect = 0;
char *transport_string, *errstr = NULL;
int transport_len, have_header = 0;
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.170 php-src/ext/standard/var.c:1.171
--- php-src/ext/standard/var.c:1.170 Mon Aug 11 19:16:53 2003
+++ php-src/ext/standard/var.c Thu Aug 28 12:28:33 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.170 2003/08/11 23:16:53 iliaa Exp $ */
+/* $Id: var.c,v 1.171 2003/08/28 16:28:33 sas Exp $ */
/* {{{ includes
@@ -535,7 +535,7 @@
char *s;
ulong slen;
- slen = spprintf(&s, 0, "d:%.*G;",
PG(serialize_precision), Z_DVAL_PP(struc));
+ slen = spprintf(&s, 0, "d:%.*G;", (int)
PG(serialize_precision), Z_DVAL_PP(struc));
smart_str_appendl(buf, s, slen);
efree(s);
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
