浏览代码

utils: fixed indentation

Daniel-Constantin Mierla 10 年之前
父节点
当前提交
8a9d7df57e
共有 1 个文件被更改,包括 98 次插入98 次删除
  1. 98 98
      modules/utils/functions.c

+ 98 - 98
modules/utils/functions.c

@@ -52,25 +52,25 @@
  */
 size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr)
 {
-    http_res_stream_t *stream = (http_res_stream_t *) stream_ptr;
+	http_res_stream_t *stream = (http_res_stream_t *) stream_ptr;
 
-    stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + 
-				(size * nmemb) + 1);
+	stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + 
+			(size * nmemb) + 1);
 
-    if (stream->buf == NULL) {
-	LM_ERR("cannot allocate memory for stream\n");
-	return CURLE_WRITE_ERROR;
-    }
+	if (stream->buf == NULL) {
+		LM_ERR("cannot allocate memory for stream\n");
+		return CURLE_WRITE_ERROR;
+	}
 
-    memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb));
+	memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb));
 
-    stream->curr_size += ((size * nmemb) + 1);
-    stream->pos += (size * nmemb);
+	stream->curr_size += ((size * nmemb) + 1);
+	stream->pos += (size * nmemb);
 
-    stream->buf[stream->pos + 1] = '\0';
+	stream->buf[stream->pos + 1] = '\0';
 
-    return size * nmemb;
- }
+	return size * nmemb;
+}
 
 
 /* 
@@ -79,73 +79,73 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr)
  */
 int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post)
 {
-    CURL *curl;
-    CURLcode res;  
-    str value, post_value;
-    char *url, *at, *post;
-    http_res_stream_t stream;
-    long stat;
-    pv_spec_t *dst;
-    pv_value_t val;
-    double download_size;
-
-    memset(&stream, 0, sizeof(http_res_stream_t));
-
-    if (fixup_get_svalue(_m, (gparam_p)_url, &value) != 0) {
-	LM_ERR("cannot get page value\n");
-	return -1;
-    }
-
-    curl = curl_easy_init();
-    if (curl == NULL) {
-	LM_ERR("failed to initialize curl\n");
-	return -1;
-    }
-
-    url = pkg_malloc(value.len + 1);
-    if (url == NULL) {
-	curl_easy_cleanup(curl);
-	LM_ERR("cannot allocate pkg memory for url\n");
-	return -1;
-    }
-    memcpy(url, value.s, value.len);
-    *(url + value.len) = (char)0;
-    curl_easy_setopt(curl, CURLOPT_URL, url);
-
-    if (_post) {
-        /* Now specify we want to POST data */ 
-	curl_easy_setopt(curl, CURLOPT_POST, 1L);
-
-    	if (fixup_get_svalue(_m, (gparam_p)_post, &post_value) != 0) {
-		LM_ERR("cannot get post value\n");
-		curl_easy_cleanup(curl);
-		pkg_free(url);
+	CURL *curl;
+	CURLcode res;  
+	str value, post_value;
+	char *url, *at, *post;
+	http_res_stream_t stream;
+	long stat;
+	pv_spec_t *dst;
+	pv_value_t val;
+	double download_size;
+
+	memset(&stream, 0, sizeof(http_res_stream_t));
+
+	if (fixup_get_svalue(_m, (gparam_p)_url, &value) != 0) {
+		LM_ERR("cannot get page value\n");
 		return -1;
-    	}
-        post = pkg_malloc(post_value.len + 1);
-        if (post == NULL) {
+	}
+
+	curl = curl_easy_init();
+	if (curl == NULL) {
+		LM_ERR("failed to initialize curl\n");
+		return -1;
+	}
+
+	url = pkg_malloc(value.len + 1);
+	if (url == NULL) {
 		curl_easy_cleanup(curl);
-		pkg_free(url);
-        	LM_ERR("cannot allocate pkg memory for post\n");
-        	return -1;
+		LM_ERR("cannot allocate pkg memory for url\n");
+		return -1;
+	}
+	memcpy(url, value.s, value.len);
+	*(url + value.len) = (char)0;
+	curl_easy_setopt(curl, CURLOPT_URL, url);
+
+	if (_post) {
+		/* Now specify we want to POST data */ 
+		curl_easy_setopt(curl, CURLOPT_POST, 1L);
+
+		if (fixup_get_svalue(_m, (gparam_p)_post, &post_value) != 0) {
+			LM_ERR("cannot get post value\n");
+			curl_easy_cleanup(curl);
+			pkg_free(url);
+			return -1;
+		}
+		post = pkg_malloc(post_value.len + 1);
+		if (post == NULL) {
+			curl_easy_cleanup(curl);
+			pkg_free(url);
+			LM_ERR("cannot allocate pkg memory for post\n");
+			return -1;
+		}
+		memcpy(post, post_value.s, post_value.len);
+		*(post + post_value.len) = (char)0;
+		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post);
 	}
-	memcpy(post, post_value.s, post_value.len);
-	*(post + post_value.len) = (char)0;
- 	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post);
-    }
-       
 
-    curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
-    curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)http_query_timeout);
 
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream);
+	curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);
+	curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)http_query_timeout);
+
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream);
 
-    res = curl_easy_perform(curl);  
-    pkg_free(url);
-    if (_post) {
-	pkg_free(post);
-    }
+	res = curl_easy_perform(curl);  
+	pkg_free(url);
+	if (_post) {
+		pkg_free(post);
+	}
 
 	if (res != CURLE_OK) {
 		/* http://curl.haxx.se/libcurl/c/libcurl-errors.html */
@@ -156,33 +156,33 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post)
 		} else {
 			LM_ERR("failed to perform curl (%d)\n", res);
 		}
-	
+
 		curl_easy_cleanup(curl);
 		if(stream.buf)
 			pkg_free(stream.buf);
 		return -1;
-    }
-
-    curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &stat);
-    if ((stat >= 200) && (stat < 500)) {
-	curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &download_size);
-	LM_DBG("http_query download size: %u\n", (unsigned int)download_size);
-
-	/* search for line feed */
-	at = memchr(stream.buf, (char)10, download_size);
-	if (at == NULL) {
-	    /* not found: use whole stream */
-	    at = stream.buf + (unsigned int)download_size;
 	}
-	val.rs.s = stream.buf;
-	val.rs.len = at - stream.buf;
-	LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s);
-	val.flags = PV_VAL_STR;
-	dst = (pv_spec_t *)_dst;
-	dst->setf(_m, &dst->pvp, (int)EQ_T, &val);
-    }
-	
-    curl_easy_cleanup(curl);
-    pkg_free(stream.buf);
-    return stat;
+
+	curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &stat);
+	if ((stat >= 200) && (stat < 500)) {
+		curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &download_size);
+		LM_DBG("http_query download size: %u\n", (unsigned int)download_size);
+
+		/* search for line feed */
+		at = memchr(stream.buf, (char)10, download_size);
+		if (at == NULL) {
+			/* not found: use whole stream */
+			at = stream.buf + (unsigned int)download_size;
+		}
+		val.rs.s = stream.buf;
+		val.rs.len = at - stream.buf;
+		LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s);
+		val.flags = PV_VAL_STR;
+		dst = (pv_spec_t *)_dst;
+		dst->setf(_m, &dst->pvp, (int)EQ_T, &val);
+	}
+
+	curl_easy_cleanup(curl);
+	pkg_free(stream.buf);
+	return stat;
 }