From e5be9944edcfa295667301de80db78475c7c019c Mon Sep 17 00:00:00 2001
From: shermp <14854761+shermp@users.noreply.github.com>
Date: Sun, 9 Jun 2019 14:52:07 +1200
Subject: [PATCH] Implement initial test prog, and fix header

---
 src/minivhd.h                          | 2 +-
 src/minivhd_internal.h                 | 5 -----
 src/{minivhd_uitl.c => minivhd_util.c} | 5 +++++
 test_program/minivhd_test.c            | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename src/{minivhd_uitl.c => minivhd_util.c} (62%)

diff --git a/src/minivhd.h b/src/minivhd.h
index 8a2407a..5e3a3a1 100644
--- a/src/minivhd.h
+++ b/src/minivhd.h
@@ -24,7 +24,7 @@ typedef struct MVHDMeta {
     char* filename;
     MVHDFooter footer;
     MVHDSparseHeader sparse;
-    MVHDMeta* parent;
+    struct MVHDMeta* parent;
 } MVHDMeta;
 
 MVHDMeta* mvhd_open(const char* path, int* err);
diff --git a/src/minivhd_internal.h b/src/minivhd_internal.h
index d0ebb7c..d815aba 100644
--- a/src/minivhd_internal.h
+++ b/src/minivhd_internal.h
@@ -53,11 +53,6 @@ typedef struct MVHDSparseHeader
         uint8_t reserved_2[256];
 } MVHDSparseHeader;
 
-const char MVHD_CONECTIX_COOKIE[] = "conectix";
-const char MVHD_CREATOR[] = "pcem";
-const char MVHD_CREATOR_HOST_OS[] = "Wi2k";
-const char MVHD_CXSPARSE_COOKIE[] = "cxsparse";
-
 bool mvhd_is_conectix_str(const void* buffer);
 void mvhd_buffer_to_footer(MVHDFooter* footer, uint8_t* buffer);
 void mvhd_buffer_to_header(MVHDSparseHeader* header, uint8_t* buffer);
diff --git a/src/minivhd_uitl.c b/src/minivhd_util.c
similarity index 62%
rename from src/minivhd_uitl.c
rename to src/minivhd_util.c
index 66e5c7a..927b354 100644
--- a/src/minivhd_uitl.c
+++ b/src/minivhd_util.c
@@ -3,6 +3,11 @@
 #include "minivhd_internal.h"
 //#include "minivhd.h"
 
+const char MVHD_CONECTIX_COOKIE[] = "conectix";
+const char MVHD_CREATOR[] = "pcem";
+const char MVHD_CREATOR_HOST_OS[] = "Wi2k";
+const char MVHD_CXSPARSE_COOKIE[] = "cxsparse";
+
 bool mvhd_is_conectix_str(const void* buffer) {
     if (strncmp(buffer, MVHD_CONECTIX_COOKIE, strlen(MVHD_CONECTIX_COOKIE)) == 0) {
         return true;
diff --git a/test_program/minivhd_test.c b/test_program/minivhd_test.c
index ece0e23..fa35e9a 100644
--- a/test_program/minivhd_test.c
+++ b/test_program/minivhd_test.c
@@ -9,4 +9,5 @@ int main(int argc, char* argv[]) {
     char* path = argv[1];
     int err;
     MVHDMeta* vhdm = mvhd_open(path, &err);
+    return 0;
 }
\ No newline at end of file