From: Art Cancro Date: Fri, 25 Nov 2011 20:50:27 +0000 (-0500) Subject: Cleanup of previous commit X-Git-Tag: v8.03~19^2~7 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=93c11f5e13de55b1c7b019881e2f3fd67401851d Cleanup of previous commit --- diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index 39af689e4..9bee4e6d2 100644 --- a/citadel/modules/openid/serv_openid_rp.c +++ b/citadel/modules/openid/serv_openid_rp.c @@ -589,7 +589,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf) { StrBuf *ReplyBuf; CURL *curl; - CURLcode res; + CURLcode result; char *effective_url = NULL; char errmsg[1024] = ""; @@ -598,18 +598,15 @@ int fetch_http(StrBuf *url, StrBuf **target_buf) if (ReplyBuf == 0) return(-1); curl = ctdl_openid_curl_easy_init(errmsg); - if (!curl) { - syslog(LOG_ALERT, "Unable to initialize libcurl."); - return(-1); - } + if (!curl) return(-1); curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(url)); curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback); - res = curl_easy_perform(curl); - if (res) { - syslog(LOG_DEBUG, "libcurl error %d: %s", res, errmsg); + result = curl_easy_perform(curl); + if (result) { + syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg); } curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url); StrBufPlain(url, effective_url, -1);