From 46d390f9a1cdd47d1f03557e73a32c12122135cb Mon Sep 17 00:00:00 2001
From: Michael Scherle
Date: Sun, 14 Oct 2018 16:06:37 -0700
Subject: Fixes and also included the Image merging programm

---
 src/fuse/cowMerger/src/merger.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/fuse/cowMerger/src/merger.h

(limited to 'src/fuse/cowMerger/src/merger.h')

diff --git a/src/fuse/cowMerger/src/merger.h b/src/fuse/cowMerger/src/merger.h
new file mode 100644
index 0000000..c7d256d
--- /dev/null
+++ b/src/fuse/cowMerger/src/merger.h
@@ -0,0 +1,15 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <libgen.h>
+#include <stdint.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+bool merger(char *imageFilePath, char *cowFilePath);
+bool loadFiles(char *imageFilePath, char *cowFilePath);
+bool merge();
-- 
cgit v1.2.3-55-g7522