[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c

[Felipe Pena]

felipe                                   Wed, 16 Sep 2009 18:01:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288384

Log:
- Fixed ZTS build

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/curl/interface.c
    U   php/php-src/trunk/ext/curl/interface.c

Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c   2009-09-16 17:54:16 UTC 
(rev 288383)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c   2009-09-16 18:01:10 UTC 
(rev 288384)
@@ -1347,7 +1347,6 @@
  */
 static void split_certinfo(char *string, zval *hash)
 {
-       int i;
        char *org = estrdup(string);
        char *s = org;
        char *split;
@@ -1377,13 +1376,12 @@

 /* {{{ create_certinfo
  */
-static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
+static void create_certinfo(struct curl_certinfo *ci, zval *listcode TSRMLS_DC)
 {
        int i;

        if(ci) {
                zval *certhash = NULL;
-               char *tmp;

                for(i=0; i<ci->num_of_certs; i++) {
                        struct curl_slist *slist;
@@ -2271,7 +2269,7 @@
                if (curl_easy_getinfo(ch->cp, CURLINFO_CERTINFO, &ci) == 
CURLE_OK) {
                        MAKE_STD_ZVAL(listcode);
                        array_init(listcode);
-                       create_certinfo(ci, listcode);
+                       create_certinfo(ci, listcode TSRMLS_CC);
                        CAAZ("certinfo", listcode);
                }
 #endif
@@ -2341,7 +2339,7 @@
                                array_init(return_value);

                                if (curl_easy_getinfo(ch->cp, 
CURLINFO_CERTINFO, &ci) == CURLE_OK) {
-                                       create_certinfo(ci, return_value);
+                                       create_certinfo(ci, return_value 
TSRMLS_CC);
                                } else {
                                        RETURN_FALSE;
                                }

Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c      2009-09-16 17:54:16 UTC (rev 
288383)
+++ php/php-src/trunk/ext/curl/interface.c      2009-09-16 18:01:10 UTC (rev 
288384)
@@ -1350,7 +1350,6 @@
  */
 static void split_certinfo(char *string, zval *hash)
 {
-       int i;
        char *org = estrdup(string);
        char *s = org;
        char *split;
@@ -1380,13 +1379,12 @@

 /* {{{ create_certinfo
  */
-static void create_certinfo(struct curl_certinfo *ci, zval *listcode)
+static void create_certinfo(struct curl_certinfo *ci, zval *listcode TSRMLS_DC)
 {
        int i;

        if(ci) {
                zval *certhash = NULL;
-               char *tmp;

                for(i=0; i<ci->num_of_certs; i++) {
                        struct curl_slist *slist;
@@ -2337,7 +2335,7 @@
                if (curl_easy_getinfo(ch->cp, CURLINFO_CERTINFO, &ci) == 
CURLE_OK) {
                        MAKE_STD_ZVAL(listcode);
                        array_init(listcode);
-                       create_certinfo(ci, listcode);
+                       create_certinfo(ci, listcode TSRMLS_CC);
                        CAAZ("certinfo", listcode);
                }
 #endif
@@ -2407,7 +2405,7 @@
                                array_init(return_value);

                                if (curl_easy_getinfo(ch->cp, 
CURLINFO_CERTINFO, &ci) == CURLE_OK) {
-                                       create_certinfo(ci, return_value);
+                                       create_certinfo(ci, return_value 
TSRMLS_CC);
                                } else {
                                        RETURN_FALSE;
                                }


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php