lbarnaud Tue Oct 21 22:08:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c assert.c basic_functions.c browscap.c
crypt.c file.c filestat.c head.c html.c
http.c info.c mail.c math.c proc_open.c
rand.c streamsfuncs.c string.c type.c
versioning.c
Log:
MFH: initialize optional vars
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.44&r2=1.308.2.21.2.37.2.45&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.44
php-src/ext/standard/array.c:1.308.2.21.2.37.2.45
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.44 Tue Sep 23 15:18:26 2008
+++ php-src/ext/standard/array.c Tue Oct 21 22:08:36 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.44 2008/09/23 15:18:26 nlopess Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.45 2008/10/21 22:08:36 lbarnaud Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1981,14 +1981,14 @@
PHP_FUNCTION(array_splice)
{
zval *array, /* Input array */
- *repl_array, /* Replacement array */
+ *repl_array = NULL, /* Replacement array */
***repl = NULL; /* Replacement elements */
HashTable *new_hash = NULL, /* Output array's hash */
**rem_hash = NULL; /* Removed elements' hash */
Bucket *p; /* Bucket used for
traversing hash */
long i,
offset,
- length,
+ length = 0,
repl_num = 0; /* Number of replacement
elements */
int num_in; /* Number of elements
in the input array */
@@ -2061,7 +2061,7 @@
PHP_FUNCTION(array_slice)
{
zval *input, /* Input array */
- **z_length, /* How many elements to get */
+ **z_length = NULL, /* How many elements to get */
**entry; /* An array entry */
long offset, /* Offset to get elements from */
length = 0;
@@ -4004,7 +4004,7 @@
zval *retval;
zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
- zval *initial;
+ zval *initial = NULL;
HashPosition pos;
HashTable *htbl;
@@ -4073,7 +4073,7 @@
zval *retval = NULL;
zend_bool have_callback = 0;
char *string_key;
- zend_fcall_info fci;
+ zend_fcall_info fci = empty_fcall_info;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
uint string_key_len;
ulong num_key;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.60.2.3.2.6.2.3&r2=1.60.2.3.2.6.2.4&diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.60.2.3.2.6.2.3
php-src/ext/standard/assert.c:1.60.2.3.2.6.2.4
--- php-src/ext/standard/assert.c:1.60.2.3.2.6.2.3 Wed Jul 23 19:34:35 2008
+++ php-src/ext/standard/assert.c Tue Oct 21 22:08:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.60.2.3.2.6.2.3 2008/07/23 19:34:35 felipe Exp $ */
+/* $Id: assert.c,v 1.60.2.3.2.6.2.4 2008/10/21 22:08:36 lbarnaud Exp $ */
/* {{{ includes */
#include "php.h"
@@ -239,7 +239,7 @@
Set/get the various assert flags */
PHP_FUNCTION(assert_options)
{
- zval **value;
+ zval **value = NULL;
long what;
int oldint;
int ac = ZEND_NUM_ARGS();
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.64&r2=1.725.2.31.2.64.2.65&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.64
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.65
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.64 Thu Oct 16
23:19:13 2008
+++ php-src/ext/standard/basic_functions.c Tue Oct 21 22:08:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.64 2008/10/16 23:19:13 kalle Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.65 2008/10/21 22:08:36 lbarnaud
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -5066,9 +5066,9 @@
PHP_FUNCTION(error_log)
{
char *message, *opt = NULL, *headers = NULL;
- int message_len, opt_len, headers_len;
+ int message_len, opt_len = 0, headers_len = 0;
int opt_err = 0, argc = ZEND_NUM_ARGS();
- long erropt;
+ long erropt = 0;
if (zend_parse_parameters(argc TSRMLS_CC, "s|lss", &message,
&message_len, &erropt, &opt, &opt_len, &headers, &headers_len) == FAILURE) {
return;
@@ -5948,7 +5948,7 @@
PHP_FUNCTION(ignore_user_abort)
{
char *arg = NULL;
- int arg_len;
+ int arg_len = 0;
int old_setting;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &arg,
&arg_len) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.85.2.2.2.3.2.9&r2=1.85.2.2.2.3.2.10&diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.9
php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.10
--- php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.9 Fri Aug 29 14:14:09 2008
+++ php-src/ext/standard/browscap.c Tue Oct 21 22:08:37 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.85.2.2.2.3.2.9 2008/08/29 14:14:09 tony2001 Exp $ */
+/* $Id: browscap.c,v 1.85.2.2.2.3.2.10 2008/10/21 22:08:37 lbarnaud Exp $ */
#include "php.h"
#include "php_browscap.h"
@@ -326,7 +326,7 @@
PHP_FUNCTION(get_browser)
{
char *agent_name = NULL;
- int agent_name_len;
+ int agent_name_len = 0;
zend_bool return_array = 0;
zval **agent, **z_agent_name;
zval *found_browser_entry, *tmp_copy;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.62.2.1.2.6.2.4&r2=1.62.2.1.2.6.2.5&diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.4
php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.5
--- php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.4 Tue Aug 19 15:14:46 2008
+++ php-src/ext/standard/crypt.c Tue Oct 21 22:08:37 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: crypt.c,v 1.62.2.1.2.6.2.4 2008/08/19 15:14:46 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.62.2.1.2.6.2.5 2008/10/21 22:08:37 lbarnaud Exp $ */
#include <stdlib.h>
@@ -136,7 +136,7 @@
{
char salt[PHP_MAX_SALT_LEN + 1];
char *str, *salt_in = NULL;
- int str_len, salt_in_len;
+ int str_len, salt_in_len = 0;
salt[0] = salt[PHP_MAX_SALT_LEN] = '\0';
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.22&r2=1.409.2.6.2.28.2.23&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.22
php-src/ext/standard/file.c:1.409.2.6.2.28.2.23
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.22 Fri Sep 12 01:14:14 2008
+++ php-src/ext/standard/file.c Tue Oct 21 22:08:37 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.22 2008/09/12 01:14:14 felipe Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.23 2008/10/21 22:08:37 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1223,7 +1223,7 @@
int arg2len;
int ret;
int num_bytes;
- long arg3;
+ long arg3 = 0;
char *buffer = NULL;
php_stream *stream;
@@ -1441,7 +1441,7 @@
Return or change the umask */
PHP_FUNCTION(umask)
{
- long arg1;
+ long arg1 = 0;
int oldumask;
int arg_count = ZEND_NUM_ARGS();
@@ -1879,7 +1879,7 @@
int ret;
zval *fp = NULL, *fields = NULL, **field_tmp = NULL, field;
char *delimiter_str = NULL, *enclosure_str = NULL;
- int delimiter_str_len, enclosure_str_len;
+ int delimiter_str_len = 0, enclosure_str_len = 0;
HashPosition pos;
int count, i = 0;
smart_str csvline = {0};
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.14.2.7&r2=1.136.2.8.2.14.2.8&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.7
php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.8
--- php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.7 Thu Aug 7 09:25:33 2008
+++ php-src/ext/standard/filestat.c Tue Oct 21 22:08:37 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.136.2.8.2.14.2.7 2008/08/07 09:25:33 lbarnaud Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.14.2.8 2008/10/21 22:08:37 lbarnaud Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -741,7 +741,7 @@
{
zend_bool clear_realpath_cache = 0;
char *filename = NULL;
- int filename_len;
+ int filename_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bs",
&clear_realpath_cache, &filename, &filename_len) == FAILURE) {
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.84.2.1.2.7.2.4&r2=1.84.2.1.2.7.2.5&diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.84.2.1.2.7.2.4
php-src/ext/standard/head.c:1.84.2.1.2.7.2.5
--- php-src/ext/standard/head.c:1.84.2.1.2.7.2.4 Tue Jun 10 08:14:52 2008
+++ php-src/ext/standard/head.c Tue Oct 21 22:08:37 2008
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.84.2.1.2.7.2.4 2008/06/10 08:14:52 tony2001 Exp $ */
+/* $Id: head.c,v 1.84.2.1.2.7.2.5 2008/10/21 22:08:37 lbarnaud Exp $ */
#include <stdio.h>
#include "php.h"
@@ -197,7 +197,7 @@
Returns true if headers have already been sent, false otherwise */
PHP_FUNCTION(headers_sent)
{
- zval *arg1, *arg2;
+ zval *arg1 = NULL, *arg2 = NULL;
char *file="";
int line=0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.14.2.11&r2=1.111.2.2.2.14.2.12&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.14.2.11
php-src/ext/standard/html.c:1.111.2.2.2.14.2.12
--- php-src/ext/standard/html.c:1.111.2.2.2.14.2.11 Mon Aug 18 03:26:21 2008
+++ php-src/ext/standard/html.c Tue Oct 21 22:08:37 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.111.2.2.2.14.2.11 2008/08/18 03:26:21 moriyoshi Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.14.2.12 2008/10/21 22:08:37 lbarnaud Exp $ */
/*
* HTML entity resources:
@@ -1371,7 +1371,7 @@
PHP_FUNCTION(html_entity_decode)
{
char *str, *hint_charset = NULL;
- int str_len, hint_charset_len, len;
+ int str_len, hint_charset_len = 0, len;
long quote_style = ENT_COMPAT;
char *replaced;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.14.2.4.2.3.2.3&r2=1.14.2.4.2.3.2.4&diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.14.2.4.2.3.2.3
php-src/ext/standard/http.c:1.14.2.4.2.3.2.4
--- php-src/ext/standard/http.c:1.14.2.4.2.3.2.3 Thu Jan 10 20:29:12 2008
+++ php-src/ext/standard/http.c Tue Oct 21 22:08:37 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: http.c,v 1.14.2.4.2.3.2.3 2008/01/10 20:29:12 shire Exp $ */
+/* $Id: http.c,v 1.14.2.4.2.3.2.4 2008/10/21 22:08:37 lbarnaud Exp $ */
#include "php_http.h"
#include "php_ini.h"
@@ -194,7 +194,7 @@
{
zval *formdata;
char *prefix = NULL, *arg_sep=NULL;
- int arg_sep_len, prefix_len = 0;
+ int arg_sep_len = 0, prefix_len = 0;
smart_str formstr = {0};
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.12&r2=1.249.2.10.2.14.2.13&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.12
php-src/ext/standard/info.c:1.249.2.10.2.14.2.13
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.12 Thu Oct 2 08:46:16 2008
+++ php-src/ext/standard/info.c Tue Oct 21 22:08:37 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.12 2008/10/02 08:46:16 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.13 2008/10/21 22:08:37 lbarnaud Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1001,17 +1001,12 @@
Output a page of useful information about PHP and the current request */
PHP_FUNCTION(phpinfo)
{
- int argc = ZEND_NUM_ARGS();
- long flag;
+ long flag = PHP_INFO_ALL;
- if (zend_parse_parameters(argc TSRMLS_CC, "|l", &flag) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flag) ==
FAILURE) {
return;
}
- if(!argc) {
- flag = PHP_INFO_ALL;
- }
-
/* Andale! Andale! Yee-Hah! */
php_start_ob_buffer(NULL, 4096, 0 TSRMLS_CC);
php_print_info(flag TSRMLS_CC);
@@ -1052,17 +1047,12 @@
Prints the list of people who've contributed to the PHP project */
PHP_FUNCTION(phpcredits)
{
- int argc = ZEND_NUM_ARGS();
- long flag;
+ long flag = PHP_CREDITS_ALL;
- if (zend_parse_parameters(argc TSRMLS_CC, "|l", &flag) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flag) ==
FAILURE) {
return;
}
- if(!argc) {
- flag = PHP_CREDITS_ALL;
- }
-
php_print_credits(flag TSRMLS_CC);
RETURN_TRUE;
}
@@ -1164,7 +1154,7 @@
PHP_FUNCTION(php_uname)
{
char *mode = "a";
- int modelen;
+ int modelen = sizeof("a")-1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &mode,
&modelen) == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.87.2.1.2.7.2.4&r2=1.87.2.1.2.7.2.5&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.87.2.1.2.7.2.4
php-src/ext/standard/mail.c:1.87.2.1.2.7.2.5
--- php-src/ext/standard/mail.c:1.87.2.1.2.7.2.4 Fri Oct 3 13:32:41 2008
+++ php-src/ext/standard/mail.c Tue Oct 21 22:08:37 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.87.2.1.2.7.2.4 2008/10/03 13:32:41 mkoppanen Exp $ */
+/* $Id: mail.c,v 1.87.2.1.2.7.2.5 2008/10/21 22:08:37 lbarnaud Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -95,8 +95,8 @@
{
char *to=NULL, *message=NULL, *headers=NULL;
char *subject=NULL, *extra_cmd=NULL;
- int to_len, message_len, headers_len;
- int subject_len, extra_cmd_len, i;
+ int to_len, message_len, headers_len = 0;
+ int subject_len, extra_cmd_len = 0, i;
char *force_extra_parameters = INI_STR("mail.force_extra_parameters");
char *to_r, *subject_r;
char *p, *e;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.8&r2=1.131.2.2.2.6.2.9&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.8
php-src/ext/standard/math.c:1.131.2.2.2.6.2.9
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.8 Thu May 8 04:23:26 2008
+++ php-src/ext/standard/math.c Tue Oct 21 22:08:37 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.8 2008/05/08 04:23:26 mattwil Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.9 2008/10/21 22:08:37 lbarnaud Exp $ */
#include "php.h"
#include "php_math.h"
@@ -1040,7 +1040,7 @@
PHP_FUNCTION(number_format)
{
double num;
- long dec;
+ long dec = 0;
char *thousand_sep = NULL, *dec_point = NULL;
char thousand_sep_chr = ',', dec_point_chr = '.';
int thousand_sep_len = 0, dec_point_len = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.17.2.5&r2=1.36.2.1.2.17.2.6&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.17.2.5
php-src/ext/standard/proc_open.c:1.36.2.1.2.17.2.6
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.17.2.5 Thu Aug 21 11:27:57 2008
+++ php-src/ext/standard/proc_open.c Tue Oct 21 22:08:37 2008
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.17.2.5 2008/08/21 11:27:57 dmitry Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.17.2.6 2008/10/21 22:08:37 lbarnaud Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -466,7 +466,7 @@
PHP_FUNCTION(proc_open)
{
char *command, *cwd=NULL;
- int command_len, cwd_len;
+ int command_len, cwd_len = 0;
zval *descriptorspec;
zval *pipes;
zval *environment = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/rand.c?r1=1.70.2.1.2.2.2.3&r2=1.70.2.1.2.2.2.4&diff_format=u
Index: php-src/ext/standard/rand.c
diff -u php-src/ext/standard/rand.c:1.70.2.1.2.2.2.3
php-src/ext/standard/rand.c:1.70.2.1.2.2.2.4
--- php-src/ext/standard/rand.c:1.70.2.1.2.2.2.3 Wed Oct 1 11:03:15 2008
+++ php-src/ext/standard/rand.c Tue Oct 21 22:08:37 2008
@@ -23,7 +23,7 @@
| Shawn Cokus <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rand.c,v 1.70.2.1.2.2.2.3 2008/10/01 11:03:15 scottmac Exp $ */
+/* $Id: rand.c,v 1.70.2.1.2.2.2.4 2008/10/21 22:08:37 lbarnaud Exp $ */
#include <stdlib.h>
@@ -230,7 +230,7 @@
Seeds random number generator */
PHP_FUNCTION(srand)
{
- long seed;
+ long seed = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &seed) ==
FAILURE)
return;
@@ -246,7 +246,7 @@
Seeds Mersenne Twister random number generator */
PHP_FUNCTION(mt_srand)
{
- long seed;
+ long seed = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &seed) ==
FAILURE)
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.22&r2=1.58.2.6.2.15.2.23&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.22
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.23
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.22 Thu Oct 2
08:46:16 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Oct 21 22:08:37 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.22 2008/10/02 08:46:16 tony2001 Exp $
*/
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.23 2008/10/21 22:08:37 lbarnaud Exp $
*/
#include "php.h"
#include "php_globals.h"
@@ -1277,7 +1277,7 @@
PHP_FUNCTION(stream_set_timeout)
{
zval *socket;
- long seconds, microseconds;
+ long seconds, microseconds = 0;
struct timeval t;
php_stream *stream;
int argc = ZEND_NUM_ARGS();
@@ -1347,7 +1347,7 @@
Enable or disable a specific kind of crypto on the stream */
PHP_FUNCTION(stream_socket_enable_crypto)
{
- long cryptokind;
+ long cryptokind = 0;
zval *zstream, *zsessstream = NULL;
php_stream *stream, *sessstream = NULL;
zend_bool enable;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.35&r2=1.445.2.14.2.69.2.36&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.35
php-src/ext/standard/string.c:1.445.2.14.2.69.2.36
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.35 Sat Aug 16 21:32:41 2008
+++ php-src/ext/standard/string.c Tue Oct 21 22:08:37 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.35 2008/08/16 21:32:41 felipe Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.36 2008/10/21 22:08:37 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -204,10 +204,8 @@
{
char *s11, *s22;
int len1, len2;
- long start, len;
+ long start = 0, len = 0;
- start = 0;
- len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ll", &s11,
&len1,
&s22, &len2, &start, &len) == FAILURE) {
return;
@@ -2060,7 +2058,7 @@
Returns split line */
PHP_FUNCTION(chunk_split)
{
- zval **p_chunklen, **p_ending;
+ zval **p_chunklen = NULL, **p_ending = NULL;
char *str;
char *result;
char *end = "\r\n";
@@ -2119,7 +2117,7 @@
PHP_FUNCTION(substr)
{
char *str;
- long l, f;
+ long l = 0, f;
int str_len;
int argc = ZEND_NUM_ARGS();
@@ -2720,8 +2718,8 @@
PHP_FUNCTION(strtr)
{
zval **from;
- char *str, *to;
- int str_len, to_len;
+ char *str, *to = NULL;
+ int str_len, to_len = 0;
int ac = ZEND_NUM_ARGS();
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ|s", &str,
&str_len, &from, &to, &to_len) == FAILURE) {
@@ -2833,7 +2831,7 @@
PHP_FUNCTION(similar_text)
{
char *t1, *t2;
- zval **percent;
+ zval **percent = NULL;
int ac = ZEND_NUM_ARGS();
int sim;
int t1_len, t2_len;
@@ -3610,7 +3608,7 @@
*/
static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int
case_sensitivity)
{
- zval **subject, **search, **replace, **subject_entry, **zcount;
+ zval **subject, **search, **replace, **subject_entry, **zcount = NULL;
zval *result;
char *string_key;
uint string_key_len;
@@ -4702,7 +4700,7 @@
PHP_FUNCTION(substr_count)
{
char *haystack, *needle;
- long offset = 0, length;
+ long offset = 0, length = 0;
int ac = ZEND_NUM_ARGS();
int count = 0;
int haystack_len, needle_len;
@@ -4944,7 +4942,7 @@
PHP_FUNCTION(str_word_count)
{
char *buf, *str, *char_list = NULL, *p, *e, *s, ch[256];
- int str_len, char_list_len, word_count = 0;
+ int str_len, char_list_len = 0, word_count = 0;
long type = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str,
&str_len, &type, &char_list, &char_list_len) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.30.2.2.2.3.2.8&r2=1.30.2.2.2.3.2.9&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.30.2.2.2.3.2.8
php-src/ext/standard/type.c:1.30.2.2.2.3.2.9
--- php-src/ext/standard/type.c:1.30.2.2.2.3.2.8 Sat Aug 2 04:46:07 2008
+++ php-src/ext/standard/type.c Tue Oct 21 22:08:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: type.c,v 1.30.2.2.2.3.2.8 2008/08/02 04:46:07 felipe Exp $ */
+/* $Id: type.c,v 1.30.2.2.2.3.2.9 2008/10/21 22:08:38 lbarnaud Exp $ */
#include "php.h"
#include "php_incomplete_class.h"
@@ -356,7 +356,7 @@
Returns true if var is callable. */
PHP_FUNCTION(is_callable)
{
- zval *var, **callable_name;
+ zval *var, **callable_name = NULL;
char *name;
zend_bool retval;
zend_bool syntax_only = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/versioning.c?r1=1.19.2.1.2.3.2.2&r2=1.19.2.1.2.3.2.3&diff_format=u
Index: php-src/ext/standard/versioning.c
diff -u php-src/ext/standard/versioning.c:1.19.2.1.2.3.2.2
php-src/ext/standard/versioning.c:1.19.2.1.2.3.2.3
--- php-src/ext/standard/versioning.c:1.19.2.1.2.3.2.2 Tue Sep 23 15:18:26 2008
+++ php-src/ext/standard/versioning.c Tue Oct 21 22:08:38 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: versioning.c,v 1.19.2.1.2.3.2.2 2008/09/23 15:18:26 nlopess Exp $ */
+/* $Id: versioning.c,v 1.19.2.1.2.3.2.3 2008/10/21 22:08:38 lbarnaud Exp $ */
#include <stdio.h>
#include <sys/types.h>
@@ -210,8 +210,8 @@
PHP_FUNCTION(version_compare)
{
- char *v1, *v2, *op;
- int v1_len, v2_len, op_len;
+ char *v1, *v2, *op = NULL;
+ int v1_len, v2_len, op_len = 0;
int compare, argc;
argc = ZEND_NUM_ARGS();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
