Revert some minor changes

This reverts commit dc81939.

main.c

@@ -226,7 +226,10 @@ int decode_hex_stream_normal(const int cols, const long base_off)
     int c = 0, n1 = -1, n2 = 0, n3 = 0, p = cols;
     long have_off = 0, want_off = 0;
     rewind(input_file);
-    while (((c = getc(input_file)) != EOF) && (c != '\r')) {
+    while ((c = getc(input_file)) != EOF) {
+        if (c == '\r') { // DOS style newlines?
+            continue;
+        }
         n3 = n2;
         n2 = n1;
         n1 = parse_hex_digit(c);
@@ -236,9 +239,9 @@ int decode_hex_stream_normal(const int cols, const long base_off)
         if (p >= cols) {
             if (n1 < 0) {
                 p = 0;
-            } else {
-                want_off = (want_off << 4) | n1;
+                continue;
             }
+            want_off = (want_off << 4) | n1;
             continue;
         }
         ignore = false;
@@ -294,9 +297,9 @@ int decode_hex_stream_bits(const int cols)
             if (n1 < 0) {
                 p = 0;
                 bit_count = 0;
-            } else {
-                want_off = (want_off << 4) | n1;
+                continue;
             }
+            want_off = (want_off << 4) | n1;
             continue;
         }
         if (c == '\n') {