diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
| commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
| tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /wiretap | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
| download | wireshark-357cfd3b035d1ba6438e82cc1cbec105874206b6.tar.gz | |
A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 10 | ||||
| -rw-r--r-- | wiretap/pcapng.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 4e725afb0a..89dd5a8f5f 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -143,7 +143,7 @@ static const struct file_extension_info file_type_extensions_base[] = { { "TamoSoft CommView", TRUE, "ncf" }, { "Symbian OS btsnoop", TRUE, "log" }, { "XML files (including Gammu DCT3 traces)", TRUE, "xml" }, - { "OS X PacketLogger", TRUE, "pklg" }, + { "macOS PacketLogger", TRUE, "pklg" }, { "Daintree SNA", TRUE, "dcf" }, { "IPFIX File Format", TRUE, "pfx;ipfix" }, { "Aethra .aps file", TRUE, "aps" }, @@ -328,7 +328,7 @@ wtap_get_all_capture_file_extensions_list(void) * to the following files so that the various desktop environments will * know that Wireshark can open the file: * 1) wireshark-mime-package.xml (for freedesktop.org environments) - * 2) packaging/macosx/Info.plist.in (for OS X) + * 2) packaging/macosx/Info.plist.in (for macOS) * 3) packaging/nsis/AdditionalTasksPage.ini, packaging/nsis/common.nsh, * and packaging/wix/ComponentGroups.wxi (for Windows) * @@ -368,7 +368,7 @@ static struct open_info open_info_base[] = { * PacketLogger must come before MPEG, because its files * are sometimes grabbed by mpeg_open. */ - { "OS X PacketLogger", OPEN_INFO_HEURISTIC, packetlogger_open, "pklg", NULL, NULL }, + { "macOS PacketLogger", OPEN_INFO_HEURISTIC, packetlogger_open, "pklg", NULL, NULL }, /* Some MPEG files have magic numbers, others just have heuristics. */ { "MPEG", OPEN_INFO_HEURISTIC, mpeg_open, "mpg;mp3", NULL, NULL }, { "Daintree SNA", OPEN_INFO_HEURISTIC, daintree_sna_open, "dcf", NULL, NULL }, @@ -1477,7 +1477,7 @@ static const struct file_type_subtype_info dump_open_table_base[] = { NULL, NULL, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PACKETLOGGER */ - { "OS X PacketLogger", "pklg", "pklg", NULL, + { "macOS PacketLogger", "pklg", "pklg", NULL, FALSE, FALSE, 0, NULL, NULL, NULL }, @@ -2651,7 +2651,7 @@ wtap_dump_file_write(wtap_dumper *wdh, const void *buf, size_t bufsize, int *err errno = WTAP_ERR_CANT_WRITE; nwritten = fwrite(buf, 1, bufsize, (FILE *)wdh->fh); /* - * At least according to the Mac OS X man page, + * At least according to the macOS man page, * this can return a short count on an error. */ if (nwritten != bufsize) { diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 25edd61127..8d30d957af 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -3231,7 +3231,7 @@ pcapng_write_sysdig_event_block(wtap_dumper *wdh, /* * libpcap's maximum pcapng block size is currently 16MB. * - * The maximum pcapng block size in OS X's private pcapng reading code + * The maximum pcapng block size in macOS's private pcapng reading code * is 1MB. (Yes, this means that a program using the standard pcap * code to read pcapng files can handle bigger blocks than can programs * using the private code, such as Apple's tcpdump, can handle.) |