From 0bd253bf28795e75ce24196fe98f78ab46beeedf Mon Sep 17 00:00:00 2001 From: josch Date: Sun, 28 Dec 2014 09:40:52 +0100 Subject: [PATCH] fix indentation --- fuse/filecache.c | 4 ++-- mfapi/apicalls.c | 6 +++--- mfapi/apicalls.h | 2 +- mfapi/apicalls/file_get_links.c | 26 +++++++++----------------- mfapi/apicalls/upload_patch.c | 2 +- mfapi/apicalls/upload_simple.c | 2 +- mfapi/mfconn.c | 6 ++---- mfshell/commands/get.c | 4 ++-- mfshell/commands/links.c | 4 ++-- 9 files changed, 23 insertions(+), 33 deletions(-) diff --git a/fuse/filecache.c b/fuse/filecache.c index c53de89..02b9e8c 100644 --- a/fuse/filecache.c +++ b/fuse/filecache.c @@ -335,8 +335,8 @@ static int filecache_download_file(const char *filecache_path, file = file_alloc(); retval = mfconn_api_file_get_links(conn, file, - (char *)quickkey, - LINK_TYPE_DIRECT_DOWNLOAD); + (char *)quickkey, + LINK_TYPE_DIRECT_DOWNLOAD); if (retval != 0) { fprintf(stderr, "mfconn_api_file_get_links failed\n"); diff --git a/mfapi/apicalls.c b/mfapi/apicalls.c index 00459d6..a284067 100644 --- a/mfapi/apicalls.c +++ b/mfapi/apicalls.c @@ -23,12 +23,12 @@ #include "../utils/http.h" #define X_LINK_TYPE(a,b,c) c, -const char *link_types[]={ +const char *link_types[] = { #include "link_type.def" -NULL + NULL }; -#undef X_LINK_TYPE +#undef X_LINK_TYPE int mfapi_check_response(json_t * response, const char *apicall) { diff --git a/mfapi/apicalls.h b/mfapi/apicalls.h index 77d657e..7fe12aa 100644 --- a/mfapi/apicalls.h +++ b/mfapi/apicalls.h @@ -47,8 +47,8 @@ enum mfconn_device_change_type { enum { #include "link_type.def" }; -#undef X_LINK_TYPE +#undef X_LINK_TYPE struct mfconn_device_change { enum mfconn_device_change_type change; diff --git a/mfapi/apicalls/file_get_links.c b/mfapi/apicalls/file_get_links.c index c31e438..98e749f 100644 --- a/mfapi/apicalls/file_get_links.c +++ b/mfapi/apicalls/file_get_links.c @@ -28,19 +28,17 @@ #include "../file.h" #include "../apicalls.h" // IWYU pragma: keep - static int _decode_file_get_links(mfhttp * conn, void *data); int mfconn_api_file_get_links(mfconn * conn, mffile * file, - const char *quickkey,uint32_t link_mask) + const char *quickkey, uint32_t link_mask) { - const char *api_call; - extern const char *link_types[]; // declared in apicalls.c - char *link_params = NULL; - int retval; - int len; - mfhttp *http; - int i; + const char *api_call; + extern const char *link_types[]; // declared in apicalls.c + int retval; + int len; + mfhttp *http; + int i; if (conn == NULL) return -1; @@ -56,18 +54,14 @@ int mfconn_api_file_get_links(mfconn * conn, mffile * file, if (len != 11 && len != 15) return -1; - link_params = strdup_printf("link_type=%s", - link_types[link_mask]); - for (i = 0; i < mfconn_get_max_num_retries(conn); i++) { api_call = mfconn_create_signed_get(conn, 0, "file/get_links.php", "?quick_key=%s" - "&%s" + "&link_type=%s" "&response_format=json", - quickkey,link_params); + quickkey, link_types[link_mask]); if (api_call == NULL) { fprintf(stderr, "mfconn_create_signed_get failed\n"); - if(link_params != NULL) free(link_params); return -1; } @@ -95,8 +89,6 @@ int mfconn_api_file_get_links(mfconn * conn, mffile * file, } } - if(link_params != NULL) free(link_params); - return retval; } diff --git a/mfapi/apicalls/upload_patch.c b/mfapi/apicalls/upload_patch.c index 3248a13..d3d7689 100644 --- a/mfapi/apicalls/upload_patch.c +++ b/mfapi/apicalls/upload_patch.c @@ -18,7 +18,7 @@ */ #define _POSIX_C_SOURCE 200809L // for strdup -#define _BSD_SOURCE // for strdup on old systems +#define _BSD_SOURCE // for strdup on old systems #include #include diff --git a/mfapi/apicalls/upload_simple.c b/mfapi/apicalls/upload_simple.c index 5cddf38..3682b92 100644 --- a/mfapi/apicalls/upload_simple.c +++ b/mfapi/apicalls/upload_simple.c @@ -18,7 +18,7 @@ */ #define _POSIX_C_SOURCE 200809L // for strdup -#define _BSD_SOURCE // for strdup on old systems +#define _BSD_SOURCE // for strdup on old systems #include #include diff --git a/mfapi/mfconn.c b/mfapi/mfconn.c index 7e18642..51fab84 100644 --- a/mfapi/mfconn.c +++ b/mfapi/mfconn.c @@ -266,8 +266,7 @@ const char *mfconn_create_unsigned_get(mfconn * conn, int ssl, api_request = strdup_printf("%s//%s/api/%s/%s", (ssl ? "https:" : "http:"), - conn->server, - MFAPI_VERSION, api); + conn->server, MFAPI_VERSION, api); // compute the amount of space requred to realloc() the request bytes_to_alloc = api_args_len; @@ -356,8 +355,7 @@ const char *mfconn_create_signed_get(mfconn * conn, int ssl, api_request = strdup_printf("%s//%s/api/%s/%s", (ssl ? "https:" : "http:"), - conn->server, - MFAPI_VERSION, api); + conn->server, MFAPI_VERSION, api); call_hash = mfconn_create_call_signature(conn, api_request, api_args); signature = strdup_printf("&signature=%s", call_hash); diff --git a/mfshell/commands/get.c b/mfshell/commands/get.c index 0d5d835..0315fb2 100644 --- a/mfshell/commands/get.c +++ b/mfshell/commands/get.c @@ -79,8 +79,8 @@ int mfshell_cmd_get(mfshell * mfshell, int argc, char *const argv[]) } // request a direct download (streaming) link retval = mfconn_api_file_get_links(mfshell->conn, file, - (char *)quickkey, - LINK_TYPE_DIRECT_DOWNLOAD); + (char *)quickkey, + LINK_TYPE_DIRECT_DOWNLOAD); if (retval != 0) { file_free(file); diff --git a/mfshell/commands/links.c b/mfshell/commands/links.c index d3bb7f4..c3f0438 100644 --- a/mfshell/commands/links.c +++ b/mfshell/commands/links.c @@ -62,8 +62,8 @@ int mfshell_cmd_links(mfshell * mfshell, int argc, char *const argv[]) // when the lower-level call gets updated to support multiple link types // this should be updated. retval = mfconn_api_file_get_links(mfshell->conn, file, - (char *)quickkey, - LINK_TYPE_DIRECT_DOWNLOAD); + (char *)quickkey, + LINK_TYPE_DIRECT_DOWNLOAD); if (retval != 0) { fprintf(stderr, "api call unsuccessful\n"); }