Miscellaneous texual corrections and addition

Correct some symbolic references in source file comments
and add a note about the CMake configuration options.

Change-Id: Idb670a2c798c2a52cdce142340ce8fc5a2022508
Reviewed-on: https://code.wireshark.org/review/22138
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/README.cmake b/README.cmake
index 90d6f5437fd1bbe393463b3ee49f505995dc65a5..02fb73b3083c34a9718655f6dff4f54cae0339c6 100644 (file)
--- a/README.cmake
+++ b/README.cmake
@@ -69,6 +69,11 @@ Note 1:
   # particularly for MSBuild.
   -DCMAKE_TRY_COMPILE_CONFIGURATION=Release
 
+  You can list all build variables (with help) using
+  cmake -LH [options] ../<Name_of_WS_source_dir>
+  This lists the cache of build variables after the cmake run.
+  To only view the current cache, add option -N.
+
 Note 2:
   After running cmake, you can always run "make help" to see
   a list of all possible make targets.

diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 3700a9fb44a1b4a712f18c2262f316c7a4e21e7c..14f2e082cce526abd793ffe219f92854b7c1339c 100644 (file)
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -1505,7 +1505,7 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
          FALSE, FALSE, 0,
          NULL, NULL, NULL },
 
-       /* WTAP_ENCAP_MIME */
+       /* WTAP_FILE_TYPE_SUBTYPE_MIME */
        { "MIME File Format", "mime", NULL, NULL,
           FALSE, FALSE, 0,
           NULL, NULL, NULL },
@@ -1610,7 +1610,7 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
          FALSE, FALSE, 0,
          NULL, NULL, NULL },
 
-       /* WTAP_FILE_TYPE_MPLOG */
+       /* WTAP_FILE_TYPE_SUBTYPE_MPLOG */
        { "Micropross mplog file", "mplog", "mplog", NULL,
          FALSE, FALSE, 0,
          NULL, NULL, NULL }

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 204390be35c2b3973217cced22e0d04360f41ebd..a3b7fc2671867eb8abc56df1e941e46d4f7a7da8 100644 (file)
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -648,7 +648,7 @@ static struct encap_type_info encap_table_base[] = {
        /* WTAP_ENCAP_JUNIPER_VP */
        { "Juniper Voice PIC", "juniper-vp" },
 
-       /* WTAP_ENCAP_USB */
+       /* WTAP_ENCAP_USB_FREEBSD */
        { "Raw USB packets", "usb" },
 
        /* WTAP_ENCAP_IEEE802_16_MAC_CPS */