Skip to content

Commit

Permalink
Coding standards
Browse files Browse the repository at this point in the history
  • Loading branch information
adoy committed Dec 23, 2011
1 parent 3f5f5ee commit 066879f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions ext/curl/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -2672,7 +2672,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
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);
}
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions ext/curl/multi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
}
/* }}} */

Expand Down

0 comments on commit 066879f

Please sign in to comment.