[prev in list] [next in list] [prev in thread] [next in thread]
List: pecl-cvs
Subject: [PECL-CVS] svn: /pecl/solr/trunk/ solr_functions_params.c
From: Israel_Ekpo <iekpo () php ! net>
Date: 2009-09-29 3:59:50
Message-ID: svn-iekpo-1254196790-288929-516582190 () svn ! php ! net
[Download RAW message or body]
iekpo Tue, 29 Sep 2009 03:59:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288929
Log:
Fixing warnings : declaration of variables that shadows previous locals.
Changed paths:
U pecl/solr/trunk/solr_functions_params.c
Modified: pecl/solr/trunk/solr_functions_params.c
===================================================================
--- pecl/solr/trunk/solr_functions_params.c 2009-09-29 03:57:26 UTC (rev 288928)
+++ pecl/solr/trunk/solr_functions_params.c 2009-09-29 03:59:50 UTC (rev 288929)
@@ -211,10 +211,10 @@
{
solr_params_t *solr_params = NULL;
solr_param_t **param_ptr = NULL;
- HashTable *params;
+ HashTable *params = NULL;
solr_param_type_t param_type = SOLR_PARAM_TYPE_NORMAL;
- solr_param_t *param;
- solr_param_value_t *parameter_value;
+ solr_param_t *param = NULL;
+ solr_param_value_t *parameter_value = NULL;
if (!pname_length)
@@ -242,7 +242,7 @@
if (zend_hash_find(params, (char *) pname, pname_length, (void **) ¶m_ptr) == \
SUCCESS) {
- solr_param_value_t *parameter_value = (solr_param_value_t *) \
pemalloc(sizeof(solr_param_value_t), SOLR_PARAMS_PERSISTENT); + parameter_value = \
(solr_param_value_t *) pemalloc(sizeof(solr_param_value_t), SOLR_PARAMS_PERSISTENT);
memset(parameter_value, 0, sizeof(solr_param_value_t));
@@ -261,7 +261,7 @@
solr_string_appends(&(parameter_value->contents.normal), pvalue, pvalue_length);
solr_params_insert_param_value(param, parameter_value);
- if (zend_hash_add(params, (char *) pname, pname_length, (void *) ¶m, \
sizeof(solr_param_t *), (void **) NULL) == FAILURE) { + if (zend_hash_add(params, \
pname, pname_length, (void *) ¶m, sizeof(solr_param_t *), (void **) NULL) == \
FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error from %s %s=%s", __func__, (char \
*) pname, pvalue);
@@ -275,15 +275,14 @@
/* {{{ PHP_SOLR_API int solr_add_simple_list_param(zval *objptr, solr_char_t *pname, \
int pname_length, solr_char_t *pvalue, int pvalue_length TSRMLS_DC) */ PHP_SOLR_API \
int solr_add_simple_list_param(zval *objptr, solr_char_t *pname, int pname_length, \
solr_char_t *pvalue, int pvalue_length TSRMLS_DC) {
- zend_bool allow_multiple = 1; /* This value type by definition allows multiple */
+ zend_bool allow_multiple = 1; /* This value type by definition allows multiple. add \
parameters can be added more than once */ solr_params_t *solr_params = NULL;
solr_param_t **param_ptr = NULL;
- HashTable *params;
+ HashTable *params = NULL;
solr_param_type_t param_type = SOLR_PARAM_TYPE_SIMPLE_LIST;
- solr_param_t *param;
- solr_param_value_t *parameter_value;
+ solr_param_t *param = NULL;
+ solr_param_value_t *parameter_value = NULL;
-
if (!pname_length)
{
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameter name");
@@ -309,7 +308,7 @@
if (zend_hash_find(params, pname, pname_length, (void **) ¶m_ptr) == SUCCESS)
{
- solr_param_value_t *parameter_value = (solr_param_value_t *) \
pemalloc(sizeof(solr_param_value_t), SOLR_PARAMS_PERSISTENT); + parameter_value = \
(solr_param_value_t *) pemalloc(sizeof(solr_param_value_t), SOLR_PARAMS_PERSISTENT);
memset(parameter_value, 0, sizeof(solr_param_value_t));
@@ -345,9 +344,9 @@
zend_bool allow_multiple = 1; /* This value type by definition allows multiple */
solr_params_t *solr_params = NULL;
solr_param_type_t param_type = SOLR_PARAM_TYPE_ARG_LIST;
- solr_param_t *param;
- solr_param_value_t *parameter_value;
- HashTable *params;
+ solr_param_t *param = NULL;
+ solr_param_value_t *parameter_value = NULL;
+ HashTable *params = NULL;
solr_param_t **param_ptr = NULL;
if (!pname_length)
@@ -382,7 +381,7 @@
if (zend_hash_find(params, pname, pname_length, (void **) ¶m_ptr) == SUCCESS)
{
- solr_param_value_t *parameter_value = (solr_param_value_t *) \
pemalloc(sizeof(solr_param_value_t), SOLR_PARAMS_PERSISTENT); + parameter_value = \
(solr_param_value_t *) pemalloc(sizeof(solr_param_value_t), SOLR_PARAMS_PERSISTENT);
memset(parameter_value, 0, sizeof(solr_param_value_t));
@@ -467,13 +466,13 @@
ulong n_loops = solr_param->count - 1;
auto int new_pv_length = 0;
- solr_char_t *url_encoded_param_value;
+ solr_char_t *url_encoded_param_value = NULL;
while(n_loops)
{
- auto int new_pv_length = 0;
+ new_pv_length = 0;
- solr_char_t *url_encoded_param_value = \
php_raw_url_encode(current_ptr->contents.normal.str, \
current_ptr->contents.normal.len, &new_pv_length); + url_encoded_param_value = \
php_raw_url_encode(current_ptr->contents.normal.str, \
current_ptr->contents.normal.len, &new_pv_length);
solr_string_appends(buffer, solr_param->param_name, \
solr_param->param_name_length);
@@ -483,6 +482,8 @@
efree(url_encoded_param_value);
+ url_encoded_param_value = NULL;
+
solr_string_appendc(buffer, glue);
n_loops--;
@@ -497,6 +498,8 @@
solr_string_appends(buffer, url_encoded_param_value, new_pv_length);
efree(url_encoded_param_value);
+
+ url_encoded_param_value = NULL;
}
}
/* }}} */
@@ -509,7 +512,7 @@
ulong n_loops = solr_param->count - 1;
auto solr_string_t tmp_buffer;
auto int new_pv_length = 0;
- solr_char_t *url_encoded_list;
+ solr_char_t *url_encoded_list = NULL;
solr_string_appends(buffer, solr_param->param_name, solr_param->param_name_length);
solr_string_appendc(buffer, '=');
@@ -535,6 +538,8 @@
efree(url_encoded_list);
+ url_encoded_list = NULL;
+
solr_string_free(&tmp_buffer);
}
/* }}} */
@@ -548,7 +553,7 @@
ulong n_loops = solr_param->count - 1;
solr_string_t tmp_buffer;
int new_pv_length = 0;
- solr_char_t *url_encoded_list;
+ solr_char_t *url_encoded_list = NULL;
solr_string_appends(buffer, solr_param->param_name, solr_param->param_name_length);
@@ -581,6 +586,8 @@
efree(url_encoded_list);
+ url_encoded_list = NULL;
+
solr_string_free(&tmp_buffer);
}
/* }}} */
@@ -623,7 +630,6 @@
PHP_SOLR_API void solr_arg_list_param_value_display(solr_param_t *solr_param, zval \
*param_value_array) {
solr_param_value_t *current_ptr = solr_param->head;
-
register int duplicate = 1;
while (current_ptr != NULL)
@@ -712,7 +718,7 @@
PHP_SOLR_API int solr_delete_solr_parameter(zval *objptr, solr_char_t *name, int \
name_length TSRMLS_DC) {
solr_params_t *solr_params = NULL;
- HashTable *params_ht;
+ HashTable *params_ht = NULL;
if (solr_fetch_params_entry(objptr, &solr_params TSRMLS_CC) == FAILURE) {
@@ -738,9 +744,9 @@
PHP_SOLR_API int solr_delete_normal_param_value(zval *objptr, solr_char_t *pname, \
int pname_length, solr_char_t *pvalue, int pvalue_length TSRMLS_DC) {
solr_params_t *solr_params = NULL;
- HashTable *params_ht;
+ HashTable *params_ht = NULL;
solr_param_t **param_ptr = NULL;
- solr_param_value_t *target_value;
+ solr_param_value_t *target_value = NULL;
if (!pname_length)
{
@@ -797,8 +803,8 @@
{
solr_params_t *solr_params = NULL;
solr_param_t **param_ptr = NULL;
- HashTable *params_ht;
- solr_param_value_t *target_value;
+ HashTable *params_ht = NULL;
+ solr_param_value_t *target_value = NULL;
if (!pname_length)
{
@@ -854,9 +860,9 @@
PHP_SOLR_API int solr_delete_arg_list_param_value(zval *objptr, solr_char_t *pname, \
int pname_length, solr_char_t *pvalue, int pvalue_length TSRMLS_DC) {
solr_params_t *solr_params = NULL;
- HashTable *params_ht;
+ HashTable *params_ht = NULL;
solr_param_t **param_ptr = NULL;
- solr_param_value_t *target_value;
+ solr_param_value_t *target_value = NULL;
if (!pname_length)
{
--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic