]> Kevux Git Server - fll/commitdiff
Cleanup: Remove unnecessary condition block.
authorKevin Day <thekevinday@gmail.com>
Fri, 15 Apr 2022 21:00:49 +0000 (16:00 -0500)
committerKevin Day <thekevinday@gmail.com>
Fri, 15 Apr 2022 21:00:49 +0000 (16:00 -0500)
level_3/byte_dump/c/private-byte_dump.c

index e9c54e4bb4fe3ccd96feff635824c50389036a15..54451ae3d0a3797d679adb918cca4ee85829a1cb 100644 (file)
@@ -196,43 +196,41 @@ extern "C" {
       width_count = 0;
 
       // Handle incomplete character at the end of the stream.
-      if (width_count < width_utf) {
-        found_invalid_utf = F_true;
-        invalid[character_current] = width_utf;
+      found_invalid_utf = F_true;
+      invalid[character_current] = width_utf;
 
-        if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 1, &previous, &cell, &offset) == F_true) {
+      if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 1, &previous, &cell, &offset) == F_true) {
+        character_reset = F_true;
+      }
+
+      if (++width_count < width_missing) {
+        if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 2, &previous, &cell, &offset) == F_true) {
           character_reset = F_true;
         }
 
         if (++width_count < width_missing) {
-          if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 2, &previous, &cell, &offset) == F_true) {
+          if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 3, &previous, &cell, &offset) == F_true) {
             character_reset = F_true;
           }
 
           if (++width_count < width_missing) {
-            if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 3, &previous, &cell, &offset) == F_true) {
+            if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 4, &previous, &cell, &offset) == F_true) {
               character_reset = F_true;
             }
-
-            if (++width_count < width_missing) {
-              if (byte_dump_print_character_fragment(data, characters, invalid, width_utf, 4, &previous, &cell, &offset) == F_true) {
-                character_reset = F_true;
-              }
-            }
           }
         }
+      }
 
-        if (character_reset) {
-          characters.used = 0;
-          memset(&invalid, 0, sizeof(f_char_t) * data->width);
+      if (character_reset) {
+        characters.used = 0;
+        memset(&invalid, 0, sizeof(f_char_t) * data->width);
 
-          previous.bytes = column_offset;
-          previous.invalid = previous.bytes;
-        }
-        else {
-          previous.bytes = 0;
-          previous.invalid = 0;
-        }
+        previous.bytes = column_offset;
+        previous.invalid = previous.bytes;
+      }
+      else {
+        previous.bytes = 0;
+        previous.invalid = 0;
       }
 
       while (cell.column < data->width) {