1 files changed, 4 insertions, 8 deletions
diff --git a/src/main.c b/src/main.c
index 56c7791..0d9109f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "io.h"
+#include "defs.h"
 
 static const unsigned int FLAG_DATA_FORMAT = (1 << 0);
 static const unsigned int FLAG_DATA_ACCESS = (1 << 1);
@@ -22,9 +23,7 @@ int main(int argc, char **argv)
 {
 	int ret = 0;
 
-	if ((ret = parseargs(argc, argv, &settings))) {
-		goto out;
-	}
+	try_s((ret = parseargs(argc, argv, &settings)), out);
 
 	if (settings.opmode == mode_generate) {
 		file_in.name = randfile;
@@ -36,11 +35,8 @@ int main(int argc, char **argv)
 	}
 
 	file_out.name = settings.fileout ? settings.fileout : settings.filein;
-
-	if ((ret = stream_open(&file_in, &settings)) ||
-			(ret = stream_open(&file_out, &settings))) {
-		goto out;
-	}
+	try_s((	 ret = stream_open(&file_in, &settings)) ||
+		(ret = stream_open(&file_out, &settings)), out);
 
 out:
 	stream_close(&file_in);