diff options
| author | Pierrick Charron <pierrick@php.net> | 2011-12-23 21:01:05 +0000 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2011-12-23 21:01:05 +0000 |
| commit | 066879fde3870fcc5504b3d2494639775c86f8e2 (patch) | |
| tree | f79ced4fb43486860c05c4bc4d7faca42c15995b | |
| parent | 3f5f5eefe52c876c61e003059368d1c6b7f3a1a9 (diff) | |
| download | php-git-066879fde3870fcc5504b3d2494639775c86f8e2.tar.gz | |
Coding standards
| -rw-r--r-- | ext/curl/interface.c | 14 | ||||
| -rw-r--r-- | ext/curl/multi.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index bf6ffd8e90..06604cb1d6 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -960,7 +960,7 @@ PHP_MINIT_FUNCTION(curl) #endif #if LIBCURL_VERSION_NUM >= 0x071202 /* Available since 7.18.2 */ - REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL); + REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL); #endif #if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */ @@ -1743,14 +1743,14 @@ static void split_certinfo(char *string, zval *hash) char *split; if(org) { - do { + do { char *key; char *val; char *tmp; - split = strstr(s, "; "); - if(split) - *split = '\0'; + split = strstr(s, "; "); + if(split) + *split = '\0'; key = s; tmp = memchr(key, '=', 64); @@ -2672,7 +2672,7 @@ string_copy: case CURLOPT_SHARE: { php_curlsh *sh = NULL; - ZEND_FETCH_RESOURCE(sh, php_curlsh *, zvalue, -1, le_curl_share_handle_name, le_curl_share_handle); + ZEND_FETCH_RESOURCE(sh, php_curlsh *, zvalue, -1, le_curl_share_handle_name, le_curl_share_handle); if (sh) { curl_easy_setopt(ch->cp, CURLOPT_SHARE, sh->share); } @@ -3237,7 +3237,7 @@ static _php_curl_reset_handlers(php_curl *ch) if (ch->handlers->fnmatch) { if (ch->handlers->fnmatch->func_name) { zval_ptr_dtor(&ch->handlers->fnmatch->func_name); - } + } efree(ch->handlers->fnmatch); ch->handlers->fnmatch = NULL; } diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 1c498e7fb1..5d4f15beaa 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -125,8 +125,8 @@ void _php_curl_multi_cleanup_list(void *data) /* {{{ */ static int curl_compare_resources( zval *z1, zval **z2 ) /* {{{ */ { return (Z_TYPE_P( z1 ) == Z_TYPE_PP( z2 ) && - Z_TYPE_P( z1 ) == IS_RESOURCE && - Z_LVAL_P( z1 ) == Z_LVAL_PP( z2 ) ); + Z_TYPE_P( z1 ) == IS_RESOURCE && + Z_LVAL_P( z1 ) == Z_LVAL_PP( z2 ) ); } /* }}} */ |