Minor fixes:

* size_t in place of int
* Moved some variables closer to their execution scope
* Add some error checks

1 files changed, 10 insertions, 10 deletions

diff --git a/src/manifest.c b/src/manifest.c
index 672d136..240ce8e 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -18,7 +18,7 @@ Manifest *manifest_from(const char *package_dir) {
     info->packages = (ManifestPackage **) calloc(info->records + 1, sizeof(ManifestPackage *));
 
     printf("Initializing package manifest:\n");
-    for (int i = 0; i < fsdata->files_length; i++) {
+    for (size_t i = 0; i < fsdata->files_length; i++) {
         float percent = (((float)i + 1) / fsdata->files_length) * 100;
         printf("[%3.0f%%] %s\n", percent, basename(fsdata->files[i]));
         Dependencies *deps = NULL;
@@ -46,7 +46,7 @@ Manifest *manifest_from(const char *package_dir) {
         // hyphen below
         int delims = num_chars(fsdata->files[i], '-');
         if (delims > PACKAGE_MIN_DELIM) {
-            for (int t = strlen(fsdata->files[i]); t != 0; t--) {
+            for (size_t t = strlen(fsdata->files[i]); t != 0; t--) {
                 if (fsdata->files[i][t] == '-') {
                     delims--;
                     if (delims == 0) {
@@ -64,7 +64,7 @@ Manifest *manifest_from(const char *package_dir) {
         replace_text(fsdata->files[i], "*", "-");
 
         // Populate `ManifestPackage` record
-        info->packages[i]->size = get_file_size(fsdata->files[i]);
+        info->packages[i]->size = (size_t) get_file_size(fsdata->files[i]);
         strncpy(info->packages[i]->archive, basename(fsdata->files[i]), PACKAGE_MEMBER_SIZE);
         strncpy(info->packages[i]->name, basename(parts[0]), PACKAGE_MEMBER_SIZE);
         strncpy(info->packages[i]->version, parts[1], PACKAGE_MEMBER_SIZE);
@@ -111,11 +111,11 @@ int manifest_write(Manifest *info) {
     if (SPM_GLOBAL.verbose) {
         for (int i = 0; i < info->records; i++) {
             printf("%-20s: %s\n"
-                   "%-20s: %lu\n"
+                   "%-20s: %zu\n"
                    "%-20s: %s\n"
                    "%-20s: %s\n"
                    "%-20s: %s\n"
-                   "%-20s: %d\n",
+                   "%-20s: %zu\n",
                    "archive", info->packages[i]->archive,
                    "size", info->packages[i]->size,
                    "name", info->packages[i]->name,
@@ -140,11 +140,11 @@ int manifest_write(Manifest *info) {
         printf("[%3.0f%%] %s\n", percent, info->packages[i]->archive);
         reqs = join(info->packages[i]->requirements, ",");
         sprintf(dptr, "%s|" // archive
-                      "%lu|" // size
+                      "%zu|" // size
                       "%s|"  // name
                       "%s|"  // version
                       "%s|"  // revision
-                      "%d|"  // requirements_records
+                      "%zu|"  // requirements_records
                       "%s"   // requirements
                       , info->packages[i]->archive,
                       info->packages[i]->size,
@@ -174,7 +174,7 @@ Manifest *manifest_read(void) {
         perror(filename);
         return NULL;
     }
-    int total_records = 0;
+    size_t total_records = 0;
     char data[BUFSIZ];
     char *dptr = data;
     memset(dptr, '\0', BUFSIZ);
@@ -188,7 +188,7 @@ Manifest *manifest_read(void) {
     info->packages = (ManifestPackage **)calloc(total_records + 1, sizeof(ManifestPackage *));
 
     // Begin parsing the manifest
-    int i = 0;
+    size_t i = 0;
     while (fgets(dptr, BUFSIZ, fp) != NULL) {
         dptr = strip(dptr);
         char *garbage;
@@ -200,7 +200,7 @@ Manifest *manifest_read(void) {
         strncpy(info->packages[i]->name, parts[2], strlen(parts[2]));
         strncpy(info->packages[i]->version, parts[3], strlen(parts[3]));
         strncpy(info->packages[i]->revision, parts[4], strlen(parts[4]));
-        info->packages[i]->requirements_records = atoi(parts[5]);
+        info->packages[i]->requirements_records = (size_t) atoi(parts[5]);
 
         info->packages[i]->requirements = NULL;
         if (strncmp(parts[6], "*", 2) != 0) {