more refactoring

Makefile

@@ -63,11 +63,12 @@ doc:
 	doxygen Doxyfile
 
 format:
-	indent -kr -nut src/*.c src/*.h
+	astyle --style=kr --align-pointer=name src/*.c src/*.h
 
 clean:
 	-rm -f src/*.h~
 	-rm -f src/*.c~
+	-rm -f src/*orig
 	-rm -f *.o
 	-rm -f httpdirfs
 

src/cache.c

@@ -1053,8 +1053,7 @@ error.\n", recv, cf->blksz);
     /*
      * ----------- Download the next segment in background -----------------
      */
-  bgdl:
-    {
+bgdl: {
     }
     off_t next_dl_offset = round_div(offset_start, cf->blksz) * cf->blksz;
     if ((next_dl_offset > dl_offset) && !Seg_exist(cf, next_dl_offset)

src/link.c

@@ -220,8 +220,7 @@ static void LinkTable_uninitialised_fill(LinkTable * linktbl)
                 j++;
             }
         }
-    }
-    while (u);
+    } while (u);
     if (CONFIG.log_type & debug) {
         erase_string(stderr, STATUS_LEN, s);
         fprintf(stderr, "... Done!\n");
@@ -870,8 +869,7 @@ TransferStruct Link_download_full(Link * link)
             curl_easy_cleanup(curl);
             return ts;
         }
-    }
-    while (HTTP_temp_failure(http_resp));
+    } while (HTTP_temp_failure(http_resp));
 
     ret = curl_easy_getinfo(curl, CURLINFO_FILETIME, &(link->time));
     if (ret) {
@@ -881,8 +879,10 @@ TransferStruct Link_download_full(Link * link)
     return ts;
 }
 
-long
-Link_download(Link * link, char *output_buf, size_t req_size, off_t offset)
+static CURL *Link_download_curl_setup(Link *link, size_t req_size,
+                                      off_t offset,
+                                      TransferStruct *header,
+                                      TransferStruct *ts)
 {
     if (!link) {
         lprintf(fatal, "Invalid supplied\n");
@@ -890,10 +890,36 @@ Link_download(Link * link, char *output_buf, size_t req_size, off_t offset)
 
     size_t start = offset;
     size_t end = start + req_size;
+
     char range_str[64];
     snprintf(range_str, sizeof(range_str), "%lu-%lu", start, end);
     lprintf(debug, "%s: %s\n", link->linkname, range_str);
 
+    CURL *curl = Link_to_curl(link);
+    CURLcode ret =
+        curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *) header);
+    if (ret) {
+        lprintf(error, "%s", curl_easy_strerror(ret));
+    }
+    ret = curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) ts);
+    if (ret) {
+        lprintf(error, "%s", curl_easy_strerror(ret));
+    }
+    ret = curl_easy_setopt(curl, CURLOPT_PRIVATE, (void *) ts);
+    if (ret) {
+        lprintf(error, "%s", curl_easy_strerror(ret));
+    }
+    ret = curl_easy_setopt(curl, CURLOPT_RANGE, range_str);
+    if (ret) {
+        lprintf(error, "%s", curl_easy_strerror(ret));
+    }
+
+    return curl;
+}
+
+long
+Link_download(Link *link, char *output_buf, size_t req_size, off_t offset)
+{
     TransferStruct ts;
     ts.size = 0;
     ts.data = NULL;
@@ -904,24 +930,8 @@ Link_download(Link * link, char *output_buf, size_t req_size, off_t offset)
     header.size = 0;
     header.data = NULL;
 
-    CURL *curl = Link_to_curl(link);
-    CURLcode ret =
-        curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *) &header);
-    if (ret) {
-        lprintf(error, "%s", curl_easy_strerror(ret));
-    }
-    ret = curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &ts);
-    if (ret) {
-        lprintf(error, "%s", curl_easy_strerror(ret));
-    }
-    ret = curl_easy_setopt(curl, CURLOPT_PRIVATE, (void *) &ts);
-    if (ret) {
-        lprintf(error, "%s", curl_easy_strerror(ret));
-    }
-    ret = curl_easy_setopt(curl, CURLOPT_RANGE, range_str);
-    if (ret) {
-        lprintf(error, "%s", curl_easy_strerror(ret));
-    }
+    CURL *curl = Link_download_curl_setup(link, req_size, offset, &header, &ts);
+
     transfer_blocking(curl);
 
     /*
@@ -938,7 +948,7 @@ range requests\n");
     FREE(header.data);
 
     long http_resp;
-    ret = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_resp);
+    CURLcode ret = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_resp);
     if (ret) {
         lprintf(error, "%s", curl_easy_strerror(ret));
     }

src/log.c

@@ -42,8 +42,7 @@ log_printf(LogType type, const char *file, const char *func, int line,
 
         fprintf(stderr, "%s:%d:", file, line);
 
-      print_actual_message:
-        {
+print_actual_message: {
         }
         fprintf(stderr, "%s: ", func);
         va_list args;

src/network.c

@@ -343,10 +343,6 @@ void transfer_blocking(CURL * curl)
     }
 }
 
-// void transfer_semiblocking(CURL *curl) {
-
-// }
-
 void transfer_nonblocking(CURL *curl)
 {
     lprintf(network_lock_debug,