use gnu indent to enforce coding style and adapt source

- indent options are listed in ./.indent.pro
 - use test case to run indent
This commit is contained in:
josch
2014-09-20 10:59:54 +02:00
parent d8e00119b4
commit 097a855751
43 changed files with 1325 additions and 1278 deletions

View File

@@ -24,23 +24,26 @@
#include "http.h"
static int http_progress_cb(void *user_ptr, double dltotal, double dlnow, double ultotal, double ulnow);
static size_t http_read_buf_cb(char *data, size_t size, size_t nmemb, void *user_ptr);
static size_t http_write_buf_cb(char *data, size_t size, size_t nmemb, void *user_ptr);
static size_t http_write_file_cb(char *data, size_t size, size_t nmemb, void *user_ptr);
static int http_progress_cb(void *user_ptr, double dltotal, double dlnow,
double ultotal, double ulnow);
static size_t http_read_buf_cb(char *data, size_t size, size_t nmemb,
void *user_ptr);
static size_t http_write_buf_cb(char *data, size_t size, size_t nmemb,
void *user_ptr);
static size_t http_write_file_cb(char *data, size_t size, size_t nmemb,
void *user_ptr);
struct mfhttp
{
CURL *curl_handle;
char *write_buf;
size_t write_buf_len;
double ul_len;
double ul_now;
double dl_len;
double dl_now;
bool show_progress;
char error_buf[CURL_ERROR_SIZE];
FILE *stream;
struct mfhttp {
CURL *curl_handle;
char *write_buf;
size_t write_buf_len;
double ul_len;
double ul_now;
double dl_len;
double dl_now;
bool show_progress;
char error_buf[CURL_ERROR_SIZE];
FILE *stream;
};
/*
@@ -51,20 +54,22 @@ struct mfhttp
* keep-alive anyways.
*/
mfhttp*
http_create(void)
mfhttp *http_create(void)
{
mfhttp *conn;
CURL *curl_handle;
curl_handle = curl_easy_init();
if(curl_handle == NULL) return NULL;
mfhttp *conn;
CURL *curl_handle;
conn = (mfhttp*)calloc(1,sizeof(mfhttp));
curl_handle = curl_easy_init();
if (curl_handle == NULL)
return NULL;
conn = (mfhttp *) calloc(1, sizeof(mfhttp));
conn->curl_handle = curl_handle;
conn->show_progress = false;
curl_easy_setopt(conn->curl_handle, CURLOPT_NOPROGRESS,0);
curl_easy_setopt(conn->curl_handle, CURLOPT_PROGRESSFUNCTION, http_progress_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_NOPROGRESS, 0);
curl_easy_setopt(conn->curl_handle, CURLOPT_PROGRESSFUNCTION,
http_progress_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_PROGRESSDATA, (void *)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_FOLLOWLOCATION, 1);
@@ -77,28 +82,29 @@ http_create(void)
return conn;
}
json_t *
http_parse_buf_json(mfhttp* conn, size_t flags, json_error_t *error)
json_t *http_parse_buf_json(mfhttp * conn, size_t flags,
json_error_t * error)
{
return json_loadb(conn->write_buf, conn->write_buf_len, flags, error);
}
void
http_destroy(mfhttp* conn)
void http_destroy(mfhttp * conn)
{
curl_easy_cleanup(conn->curl_handle);
free(conn->write_buf);
free(conn);
}
static int http_progress_cb(void *user_ptr, double dltotal, double dlnow,
double ultotal, double ulnow)
static int
http_progress_cb(void *user_ptr, double dltotal, double dlnow,
double ultotal, double ulnow)
{
mfhttp *conn;
mfhttp *conn;
if (user_ptr == NULL) return 0;
if (user_ptr == NULL)
return 0;
conn = (mfhttp *)user_ptr;
conn = (mfhttp *) user_ptr;
conn->ul_len = ultotal;
conn->ul_now = ulnow;
@@ -110,18 +116,21 @@ static int http_progress_cb(void *user_ptr, double dltotal, double dlnow,
}
int
http_get_buf(mfhttp *conn, const char *url, int (*data_handler)(mfhttp *conn, void *data), void *data)
http_get_buf(mfhttp * conn, const char *url,
int (*data_handler) (mfhttp * conn, void *data), void *data)
{
int retval;
int retval;
curl_easy_reset(conn->curl_handle);
curl_easy_setopt(conn->curl_handle, CURLOPT_URL, url);
curl_easy_setopt(conn->curl_handle, CURLOPT_READFUNCTION, http_read_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_READDATA, (void*)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEFUNCTION, http_write_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEDATA, (void*)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_READDATA, (void *)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEFUNCTION,
http_write_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEDATA, (void *)conn);
//fprintf(stderr, "GET: %s\n", url);
retval = curl_easy_perform(conn->curl_handle);
if(retval != CURLE_OK) {
if (retval != CURLE_OK) {
fprintf(stderr, "error curl_easy_perform %s\n\r", conn->error_buf);
return retval;
}
@@ -131,14 +140,15 @@ http_get_buf(mfhttp *conn, const char *url, int (*data_handler)(mfhttp *conn, vo
return retval;
}
static size_t
static size_t
http_read_buf_cb(char *data, size_t size, size_t nmemb, void *user_ptr)
{
size_t data_len;
size_t data_len;
if (user_ptr == NULL) return 0;
if (user_ptr == NULL)
return 0;
data_len = size*nmemb;
data_len = size * nmemb;
if (data_len > 0) {
fwrite(data, size, nmemb, stderr);
@@ -149,21 +159,22 @@ http_read_buf_cb(char *data, size_t size, size_t nmemb, void *user_ptr)
return 0;
}
static size_t
static size_t
http_write_buf_cb(char *data, size_t size, size_t nmemb, void *user_ptr)
{
mfhttp *conn;
size_t data_len;
mfhttp *conn;
size_t data_len;
if (user_ptr == NULL) return 0;
if (user_ptr == NULL)
return 0;
conn = (mfhttp*)user_ptr;
data_len = size*nmemb;
conn = (mfhttp *) user_ptr;
data_len = size * nmemb;
if (data_len > 0) {
//fwrite(data, size, nmemb, stderr);
conn->write_buf = (char *)realloc(conn->write_buf,
conn->write_buf_len + data_len);
conn->write_buf_len + data_len);
memcpy(conn->write_buf + conn->write_buf_len, data, data_len);
conn->write_buf_len += data_len;
}
@@ -172,18 +183,21 @@ http_write_buf_cb(char *data, size_t size, size_t nmemb, void *user_ptr)
}
int
http_post_buf(mfhttp *conn, const char *url, const char *post_args, int (*data_handler)(mfhttp *conn, void *data), void *data)
http_post_buf(mfhttp * conn, const char *url, const char *post_args,
int (*data_handler) (mfhttp * conn, void *data), void *data)
{
int retval;
int retval;
curl_easy_reset(conn->curl_handle);
curl_easy_setopt(conn->curl_handle, CURLOPT_URL, url);
curl_easy_setopt(conn->curl_handle, CURLOPT_READFUNCTION, http_read_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_READDATA, (void*)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEFUNCTION, http_write_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEDATA, (void*)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_READDATA, (void *)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEFUNCTION,
http_write_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEDATA, (void *)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_POSTFIELDS, post_args);
retval = curl_easy_perform(conn->curl_handle);
if(retval != CURLE_OK) {
if (retval != CURLE_OK) {
fprintf(stderr, "error curl_easy_perform %s\n\r", conn->error_buf);
return retval;
}
@@ -193,40 +207,42 @@ http_post_buf(mfhttp *conn, const char *url, const char *post_args, int (*data_h
return retval;
}
int
http_get_file(mfhttp *conn, const char *url, const char *path)
int http_get_file(mfhttp * conn, const char *url, const char *path)
{
int retval;
int retval;
curl_easy_reset(conn->curl_handle);
curl_easy_setopt(conn->curl_handle, CURLOPT_URL, url);
curl_easy_setopt(conn->curl_handle, CURLOPT_READFUNCTION, http_read_buf_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_READDATA, (void*)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEFUNCTION, http_write_file_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEDATA, (void*)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_READDATA, (void *)conn);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEFUNCTION,
http_write_file_cb);
curl_easy_setopt(conn->curl_handle, CURLOPT_WRITEDATA, (void *)conn);
// FIXME: handle fopen() return value
conn->stream = fopen(path, "w+");
retval = curl_easy_perform(conn->curl_handle);
fclose(conn->stream);
if(retval != CURLE_OK) {
if (retval != CURLE_OK) {
fprintf(stderr, "error curl_easy_perform %s\n\r", conn->error_buf);
return retval;
}
return retval;
}
static size_t
static size_t
http_write_file_cb(char *data, size_t size, size_t nmemb, void *user_ptr)
{
mfhttp *conn;
mfhttp *conn;
if (user_ptr == NULL) return 0;
conn = (mfhttp*)user_ptr;
if (user_ptr == NULL)
return 0;
conn = (mfhttp *) user_ptr;
fwrite(data, size, nmemb, conn->stream);
fprintf(stderr, "\r %.0f / %.0f", conn->dl_now, conn->dl_len);
return size*nmemb;
return size * nmemb;
}
/*int