Honor printPlain Flag for String_evt. See #498

phaag · Feb 10, 2024 · 0001529 · 0001529
1 parent 9db4215
commit 0001529
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/output/output_fmt.c b/src/output/output_fmt.c
@@ -1728,10 +1728,14 @@ static void String_pfrule(FILE *stream, master_record_t *r) {
 static void String_nfc(FILE *stream, master_record_t *r) { fprintf(stream, "%10u", r->connID); }  // End of String_nfc
 
 static void String_evt(FILE *stream, master_record_t *r) {
-    if (r->event_flag == FW_EVENT) {
-        fprintf(stream, "%8s", fwEventString(r->event));
+    if (printPlain) {
+        fprintf(stream, "%u", r->event);
     } else {
-        fprintf(stream, "%8s", natEventString(r->event, SHORTNAME));
+        if (r->event_flag == FW_EVENT) {
+            fprintf(stream, "%8s", fwEventString(r->event));
+        } else {
+            fprintf(stream, "%8s", natEventString(r->event, SHORTNAME));
+        }
     }
 
 }  // End of String_evt