Make various names match the name of the systemd journal export block.

The name of the block, in the pcapng specification is the systemd
Journal Export Block; add "export" after "journal" in various
variable/enum/define names.

5 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c
index eea1c2e38b..4dc1c8449a 100644
--- a/epan/dissectors/file-pcapng.c
+++ b/epan/dissectors/file-pcapng.c
@@ -242,7 +242,7 @@ static gboolean pref_dissect_next_layer = FALSE;
 #define BLOCK_ENHANCED_PACKET        0x00000006
 #define BLOCK_IRIG_TIMESTAMP         0x00000007
 #define BLOCK_ARINC_429              0x00000008
-#define BLOCK_SYSTEMD_JOURNAL        0x00000009
+#define BLOCK_SYSTEMD_JOURNAL_EXPORT 0x00000009
 #define BLOCK_DSB                    0x0000000a
 #define BLOCK_SECTION_HEADER         0x0A0D0D0A
 #define BLOCK_DARWIN_PROCESS         0x80000001
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index e724ce1f94..8b0c6eac04 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -384,7 +384,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 		pinfo->current_proto = "System Call";
 		break;
 
-	case REC_TYPE_SYSTEMD_JOURNAL:
+	case REC_TYPE_SYSTEMD_JOURNAL_EXPORT:
 		pinfo->current_proto = "Systemd Journal";
 		break;
 
@@ -507,7 +507,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 			    pinfo->num, frame_len, frame_plurality);
 			break;
 
-		case REC_TYPE_SYSTEMD_JOURNAL:
+		case REC_TYPE_SYSTEMD_JOURNAL_EXPORT:
 			/*
 			 * XXX - we need to rethink what's handled by
 			 * packet-record.c, what's handled by packet-frame.c.
@@ -844,7 +844,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 				}
 				break;
 
-			case REC_TYPE_SYSTEMD_JOURNAL:
+			case REC_TYPE_SYSTEMD_JOURNAL_EXPORT:
 				if (systemd_journal_handle) {
 					call_dissector_with_data(systemd_journal_handle,
 					    tvb, pinfo, parent_tree,
diff --git a/epan/dissectors/packet-systemd-journal.c b/epan/dissectors/packet-systemd-journal.c
index 2744700f7f..b96ff7bbd8 100644
--- a/epan/dissectors/packet-systemd-journal.c
+++ b/epan/dissectors/packet-systemd-journal.c
@@ -885,7 +885,7 @@ proto_register_systemd_journal(void)
     init_jf_to_hf_map();
 }
 
-#define BLOCK_TYPE_SYSTEMD_JOURNAL 0x0000009
+#define BLOCK_TYPE_SYSTEMD_JOURNAL_EXPORT 0x0000009
 void
 proto_reg_handoff_systemd_journal(void)
 {
@@ -894,7 +894,7 @@ proto_reg_handoff_systemd_journal(void)
     file_type_subtype_systemd_journal = wtap_name_to_file_type_subtype("systemd_journal");
     if (file_type_subtype_systemd_journal != -1)
         dissector_add_uint("wtap_fts_rec", file_type_subtype_systemd_journal, sje_handle);
-    dissector_add_uint("pcapng.block_type", BLOCK_TYPE_SYSTEMD_JOURNAL, sje_handle);
+    dissector_add_uint("pcapng.block_type", BLOCK_TYPE_SYSTEMD_JOURNAL_EXPORT, sje_handle);
     // It's possible to ship journal entries over HTTP/HTTPS using
     // systemd-journal-remote. Dissecting them on the wire isn't very
     // useful since it's easy to end up with a packet containing a
diff --git a/epan/frame_data.c b/epan/frame_data.c
index 43dc081b74..d7f33b1755 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -193,13 +193,13 @@ frame_data_init(frame_data *fdata, guint32 num, const wtap_rec *rec,
     fdata->cap_len = rec->rec_header.syscall_header.event_filelen;
     break;
 
-  case REC_TYPE_SYSTEMD_JOURNAL:
+  case REC_TYPE_SYSTEMD_JOURNAL_EXPORT:
     /*
      * XXX - is cum_bytes supposed to count non-packet bytes?
      */
-    fdata->pkt_len = rec->rec_header.systemd_journal_header.record_len;
-    fdata->cum_bytes = cum_bytes + rec->rec_header.systemd_journal_header.record_len;
-    fdata->cap_len = rec->rec_header.systemd_journal_header.record_len;
+    fdata->pkt_len = rec->rec_header.systemd_journal_export_header.record_len;
+    fdata->cum_bytes = cum_bytes + rec->rec_header.systemd_journal_export_header.record_len;
+    fdata->cap_len = rec->rec_header.systemd_journal_export_header.record_len;
     break;
 
   case REC_TYPE_CUSTOM_BLOCK:
diff --git a/epan/packet.c b/epan/packet.c
index 7e64f562b2..6ab0139db5 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -502,7 +502,7 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype,
 		record_type = "System Call";
 		break;
 
-	case REC_TYPE_SYSTEMD_JOURNAL:
+	case REC_TYPE_SYSTEMD_JOURNAL_EXPORT:
 		record_type = "Systemd Journal Entry";
 		break;
 
@@ -554,7 +554,7 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype,
 		edt->pi.pseudo_header = NULL;
 		break;
 
-	case REC_TYPE_SYSTEMD_JOURNAL:
+	case REC_TYPE_SYSTEMD_JOURNAL_EXPORT:
 		edt->pi.pseudo_header = NULL;
 		break;