lbarnaud Tue Oct 21 22:06:50 2008 UTC
Modified files:
/php-src/ext/standard array.c assert.c basic_functions.c browscap.c
crypt.c file.c filestat.c head.c html.c
info.c mail.c proc_open.c rand.c
streamsfuncs.c string.c type.c versioning.c
Log:
initialize optional vars
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.464&r2=1.465&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.464 php-src/ext/standard/array.c:1.465
--- php-src/ext/standard/array.c:1.464 Tue Sep 23 15:22:05 2008
+++ php-src/ext/standard/array.c Tue Oct 21 22:06:48 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.464 2008/09/23 15:22:05 nlopess Exp $ */
+/* $Id: array.c,v 1.465 2008/10/21 22:06:48 lbarnaud Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2165,14 +2165,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 */
@@ -2245,7 +2245,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;
@@ -4233,7 +4233,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;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.77 php-src/ext/standard/assert.c:1.78
--- php-src/ext/standard/assert.c:1.77 Wed Jul 23 19:33:58 2008
+++ php-src/ext/standard/assert.c Tue Oct 21 22:06:48 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.77 2008/07/23 19:33:58 felipe Exp $ */
+/* $Id: assert.c,v 1.78 2008/10/21 22:06:48 lbarnaud Exp $ */
/* {{{ includes */
#include "php.h"
@@ -262,7 +262,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.930&r2=1.931&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.930
php-src/ext/standard/basic_functions.c:1.931
--- php-src/ext/standard/basic_functions.c:1.930 Wed Oct 15 18:41:18 2008
+++ php-src/ext/standard/basic_functions.c Tue Oct 21 22:06:48 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.930 2008/10/15 18:41:18 kalle Exp $ */
+/* $Id: basic_functions.c,v 1.931 2008/10/21 22:06:48 lbarnaud Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -5010,9 +5010,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;
@@ -6031,7 +6031,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, UG(ascii_conv)) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.102&r2=1.103&diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.102
php-src/ext/standard/browscap.c:1.103
--- php-src/ext/standard/browscap.c:1.102 Fri Aug 29 14:13:57 2008
+++ php-src/ext/standard/browscap.c Tue Oct 21 22:06:48 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.102 2008/08/29 14:13:57 tony2001 Exp $ */
+/* $Id: browscap.c,v 1.103 2008/10/21 22:06:48 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.75&r2=1.76&diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.75 php-src/ext/standard/crypt.c:1.76
--- php-src/ext/standard/crypt.c:1.75 Tue Aug 19 15:14:15 2008
+++ php-src/ext/standard/crypt.c Tue Oct 21 22:06:48 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: crypt.c,v 1.75 2008/08/19 15:14:15 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.76 2008/10/21 22:06:48 lbarnaud Exp $ */
#include <stdlib.h>
@@ -137,7 +137,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.529&r2=1.530&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.529 php-src/ext/standard/file.c:1.530
--- php-src/ext/standard/file.c:1.529 Sun Sep 14 14:55:50 2008
+++ php-src/ext/standard/file.c Tue Oct 21 22:06:48 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.529 2008/09/14 14:55:50 lbarnaud Exp $ */
+/* $Id: file.c,v 1.530 2008/10/21 22:06:48 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1601,7 +1601,7 @@
Return or change the umask */
PHP_FUNCTION(umask)
{
- long arg1;
+ long arg1 = 0;
int oldumask;
int arg_count = ZEND_NUM_ARGS();
@@ -2017,7 +2017,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.174&r2=1.175&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.174
php-src/ext/standard/filestat.c:1.175
--- php-src/ext/standard/filestat.c:1.174 Thu Aug 7 09:24:04 2008
+++ php-src/ext/standard/filestat.c Tue Oct 21 22:06:48 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.174 2008/08/07 09:24:04 lbarnaud Exp $ */
+/* $Id: filestat.c,v 1.175 2008/10/21 22:06:48 lbarnaud Exp $ */
#include "php.h"
#include "fopen_wrappers.h"
@@ -809,8 +809,8 @@
{
zend_bool clear_realpath_cache = 0;
char *filename = NULL;
- zend_uchar filename_type;
- int filename_len;
+ zend_uchar filename_type = 0;
+ int filename_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bt",
&clear_realpath_cache, &filename, &filename_len, &filename_type) == FAILURE) {
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.101&r2=1.102&diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.101 php-src/ext/standard/head.c:1.102
--- php-src/ext/standard/head.c:1.101 Tue Jun 10 08:14:45 2008
+++ php-src/ext/standard/head.c Tue Oct 21 22:06:48 2008
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.101 2008/06/10 08:14:45 tony2001 Exp $ */
+/* $Id: head.c,v 1.102 2008/10/21 22:06:48 lbarnaud Exp $ */
#include <stdio.h>
#include "php.h"
@@ -201,7 +201,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.135&r2=1.136&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.135 php-src/ext/standard/html.c:1.136
--- php-src/ext/standard/html.c:1.135 Mon Aug 18 03:26:06 2008
+++ php-src/ext/standard/html.c Tue Oct 21 22:06:48 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.135 2008/08/18 03:26:06 moriyoshi Exp $ */
+/* $Id: html.c,v 1.136 2008/10/21 22:06:48 lbarnaud Exp $ */
/*
* HTML entity resources:
@@ -1418,7 +1418,7 @@
{
zstr str;
char *hint_charset = NULL;
- int str_len, hint_charset_len, len;
+ int str_len, hint_charset_len = 0, len;
char *str_utf8;
int str_utf8_len;
zend_uchar type;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.293&r2=1.294&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.293 php-src/ext/standard/info.c:1.294
--- php-src/ext/standard/info.c:1.293 Thu Oct 2 08:46:04 2008
+++ php-src/ext/standard/info.c Tue Oct 21 22:06:48 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.293 2008/10/02 08:46:04 tony2001 Exp $ */
+/* $Id: info.c,v 1.294 2008/10/21 22:06:48 lbarnaud Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -962,17 +962,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_output_start_default(TSRMLS_C);
php_print_info(flag TSRMLS_CC);
@@ -1011,17 +1006,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;
}
@@ -1120,7 +1110,7 @@
PHP_FUNCTION(php_uname)
{
char *mode = "a";
- int modelen;
+ int modelen = sizeof("a")-1;
char *tmp;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &mode,
&modelen) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.98 php-src/ext/standard/mail.c:1.99
--- php-src/ext/standard/mail.c:1.98 Fri Oct 3 13:31:21 2008
+++ php-src/ext/standard/mail.c Tue Oct 21 22:06:48 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.98 2008/10/03 13:31:21 mkoppanen Exp $ */
+/* $Id: mail.c,v 1.99 2008/10/21 22:06:48 lbarnaud Exp $ */
#include <stdlib.h>
#include <ctype.h>
@@ -94,8 +94,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/proc_open.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.64
php-src/ext/standard/proc_open.c:1.65
--- php-src/ext/standard/proc_open.c:1.64 Thu Aug 21 11:28:09 2008
+++ php-src/ext/standard/proc_open.c Tue Oct 21 22:06:48 2008
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.64 2008/08/21 11:28:09 dmitry Exp $ */
+/* $Id: proc_open.c,v 1.65 2008/10/21 22:06:48 lbarnaud Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -432,7 +432,7 @@
{
zval **ppcommand, **ppcwd = NULL;
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.77&r2=1.78&diff_format=u
Index: php-src/ext/standard/rand.c
diff -u php-src/ext/standard/rand.c:1.77 php-src/ext/standard/rand.c:1.78
--- php-src/ext/standard/rand.c:1.77 Wed Oct 1 11:01:26 2008
+++ php-src/ext/standard/rand.c Tue Oct 21 22:06:48 2008
@@ -23,7 +23,7 @@
| Shawn Cokus <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rand.c,v 1.77 2008/10/01 11:01:26 scottmac Exp $ */
+/* $Id: rand.c,v 1.78 2008/10/21 22:06:48 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.123&r2=1.124&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.123
php-src/ext/standard/streamsfuncs.c:1.124
--- php-src/ext/standard/streamsfuncs.c:1.123 Thu Oct 2 08:46:04 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Oct 21 22:06:48 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.123 2008/10/02 08:46:04 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.124 2008/10/21 22:06:48 lbarnaud Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1427,7 +1427,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();
@@ -1489,7 +1489,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.682&r2=1.683&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.682 php-src/ext/standard/string.c:1.683
--- php-src/ext/standard/string.c:1.682 Sun Sep 14 14:56:34 2008
+++ php-src/ext/standard/string.c Tue Oct 21 22:06:48 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.682 2008/09/14 14:56:34 lbarnaud Exp $ */
+/* $Id: string.c,v 1.683 2008/10/21 22:06:48 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -214,10 +214,8 @@
void *s1, *s2;
int len1, len2;
zend_uchar type1, type2;
- long start, len; /* For UNICODE, these are codepoint units */
+ long start = 0, len = 0; /* For UNICODE, these are codepoint units */
- start = 0;
- len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "TT|ll",
&s1, &len1, &type1,
&s2, &len2, &type2,
&start, &len) ==
FAILURE) {
@@ -4297,8 +4295,8 @@
Translates characters in str using given translation tables */
PHP_FUNCTION(strtr)
{
- zstr str, to;
- int str_len, to_len;
+ zstr str, to = NULL_ZSTR;
+ int str_len, to_len = 0;
zend_uchar str_type, to_type;
zval **from;
int ac = ZEND_NUM_ARGS();
@@ -5683,7 +5681,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;
zstr string_key;
uint string_key_len;
@@ -7736,7 +7734,7 @@
PHP_FUNCTION(str_word_count)
{
zstr str, char_list = NULL_ZSTR;
- int str_len, char_list_len, word_count = 0;
+ int str_len, char_list_len = 0, word_count = 0;
zend_uchar str_type;
long type = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.57&r2=1.58&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.57 php-src/ext/standard/type.c:1.58
--- php-src/ext/standard/type.c:1.57 Tue Aug 19 02:51:27 2008
+++ php-src/ext/standard/type.c Tue Oct 21 22:06:49 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: type.c,v 1.57 2008/08/19 02:51:27 felipe Exp $ */
+/* $Id: type.c,v 1.58 2008/10/21 22:06:49 lbarnaud Exp $ */
#include "php.h"
#include "php_incomplete_class.h"
@@ -443,7 +443,7 @@
Returns true if var is callable. */
PHP_FUNCTION(is_callable)
{
- zval *var, **callable_name;
+ zval *var, **callable_name = NULL;
zval name;
zend_bool retval;
zend_bool syntax_only = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/versioning.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/standard/versioning.c
diff -u php-src/ext/standard/versioning.c:1.27
php-src/ext/standard/versioning.c:1.28
--- php-src/ext/standard/versioning.c:1.27 Tue Sep 23 15:22:05 2008
+++ php-src/ext/standard/versioning.c Tue Oct 21 22:06:49 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: versioning.c,v 1.27 2008/09/23 15:22:05 nlopess Exp $ */
+/* $Id: versioning.c,v 1.28 2008/10/21 22:06:49 lbarnaud Exp $ */
#include <stdio.h>
#include <sys/types.h>
@@ -213,8 +213,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
