3 files changed, 16 insertions, 11 deletions
diff --git a/inc/slices.h b/inc/slices.h
index 5e56269..78fb4c7 100755
--- a/inc/slices.h
+++ b/inc/slices.h
@@ -31,7 +31,7 @@ int sliceSplit(slices_t *slices, slice_t *initialSlice, address_t splitAt, slice
 
 slices_t *slicesNewEmpty();
 
-slices_t *sliceNewSingleton(address_t begin, address_t end, sliceStatus_t status);
+slices_t *slicesNewSingleton(address_t begin, address_t end, sliceStatus_t status);
 
 void slicesAppend(slices_t *slices, slice_t *slice);
 
diff --git a/inc/util.h b/inc/util.h
deleted file mode 100755
index 0724e72..0000000
--- a/inc/util.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef UTIL_H
-#define UTIL_H
-
-#include "slices.h"
-
-int parseArgs(int argc, char **argv, char *src, char *dst, char *ddOpts, address_t *beginSector, address_t *endSector);
-
-void usage();
-
-#endif /*UTIL_H*/
diff --git a/inc/utils.h b/inc/utils.h
new file mode 100755
index 0000000..c045b83
--- /dev/null
+++ b/inc/utils.h
@@ -0,0 +1,15 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#include "slices.h"
+
+struct progArgs {
+	char *src, *dst, *ddOpts, *dump;
+	address_t beginSector, endSector, blockSize;
+};
+
+int parseArgs(int argc, char **argv, struct progArgs *args);
+
+void usage(char *progname);
+
+#endif /*UTILS_H*/