Combine initializer with declaration

2 files changed, 5 insertions, 8 deletions

diff --git a/src/lib/core/download.c b/src/lib/core/download.c
index bfb323e..f07a850 100644
--- a/src/lib/core/download.c
+++ b/src/lib/core/download.c
@@ -11,20 +11,17 @@ size_t download_writer(void *fp, size_t size, size_t nmemb, void *stream) {
 
 long download(char *url, const char *filename, char **errmsg) {
     extern char *VERSION;
-    CURL *c;
-    CURLcode curl_code;
     long http_code = -1;
-    FILE *fp;
     char user_agent[20];
     sprintf(user_agent, "stasis/%s", VERSION);
     long timeout = 30L;
     char *timeout_str = getenv("STASIS_DOWNLOAD_TIMEOUT");
 
     curl_global_init(CURL_GLOBAL_ALL);
-    c = curl_easy_init();
+    CURL *c = curl_easy_init();
     curl_easy_setopt(c, CURLOPT_URL, url);
     curl_easy_setopt(c, CURLOPT_WRITEFUNCTION, download_writer);
-    fp = fopen(filename, "wb");
+    FILE *fp = fopen(filename, "wb");
     if (!fp) {
         return -1;
     }
@@ -40,7 +37,7 @@ long download(char *url, const char *filename, char **errmsg) {
     }
     curl_easy_setopt(c, CURLOPT_CONNECTTIMEOUT, timeout);
 
-    curl_code = curl_easy_perform(c);
+    CURLcode curl_code = curl_easy_perform(c);
     if (curl_code != CURLE_OK) {
         if (errmsg) {
             strcpy(*errmsg, curl_easy_strerror(curl_code));
diff --git a/src/lib/core/utils.c b/src/lib/core/utils.c
index 73a2985..11413a0 100644
--- a/src/lib/core/utils.c
+++ b/src/lib/core/utils.c
@@ -165,7 +165,6 @@ char *path_dirname(char *path) {
 char **file_readlines(const char *filename, size_t start, size_t limit, ReaderFn *readerFn) {
     FILE *fp = NULL;
     char **result = NULL;
-    char *buffer = NULL;
     size_t lines = 0;
     int use_stdin = 0;
 
@@ -186,7 +185,8 @@ char **file_readlines(const char *filename, size_t start, size_t limit, ReaderFn
     }
 
     // Allocate buffer
-    if ((buffer = calloc(STASIS_BUFSIZ, sizeof(char))) == NULL) {
+    char *buffer = calloc(STASIS_BUFSIZ, sizeof(char));
+    if (buffer == NULL) {
         SYSERROR("unable to allocate %d bytes for buffer", STASIS_BUFSIZ);
         if (!use_stdin) {
             fclose(fp);