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 /epan/dissectors | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
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 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-corosync-totemsrp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c index 1b65a4ae2d..b50db3ef68 100644 --- a/epan/dissectors/packet-corosync-totemsrp.c +++ b/epan/dissectors/packet-corosync-totemsrp.c @@ -186,7 +186,7 @@ static const value_string corosync_totemsrp_ip_address_family[] = { { COMMON_AF_INET, "AF_INET" }, { BSD_AF_INET6_BSD, "AF_INET6 (most BSD)" }, { BSD_AF_INET6_FREEBSD, "AF_INET6 (FreeBSD)" }, - { BSD_AF_INET6_DARWIN, "AF_INET6 (OS X and iOS)" }, + { BSD_AF_INET6_DARWIN, "AF_INET6 (macOS and iOS)" }, { LINUX_AF_INET6, "AF_INET6 (Linux)" }, { SOLARIS_AF_INET6, "AF_INET6 (Solaris)" }, { WINSOCK_AF_INET6, "AF_INET6 (Windows)" }, diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index 073d6179b1..e520704d08 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -1008,7 +1008,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u /* * XXX On FreeBSD rate & 0x80 means we have an MCS. On * Linux and AirPcap it does not. (What about - * Mac OS X, NetBSD, OpenBSD, and DragonFly BSD?) + * macOS, NetBSD, OpenBSD, and DragonFly BSD?) * * This is an issue either for proprietary extensions * to 11a or 11g, which do exist, or for 11n diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index bbda7d561b..eb5fefcc65 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1658,7 +1658,7 @@ get_conversation_for_call(packet_info *pinfo) * there's no guarantee that the reply will come from the * address to which the call was sent. We also don't * worry about the port *from* which the call was sent, - * because some clients (*cough* OS X NFS client *cough*) + * because some clients (*cough* macOS NFS client *cough*) * might send retransmissions from a different port from * the original request. */ @@ -1710,7 +1710,7 @@ find_conversation_for_reply(packet_info *pinfo) * because there's no guarantee that the call was sent * to the address from which the reply came. We also * don't worry about the port *to* which the reply was - * sent, because some clients (*cough* OS X NFS client + * sent, because some clients (*cough* macOS NFS client * *cough*) might send call retransmissions from a * different port from the original request, so replies * to the original call and a retransmission of the call @@ -2114,7 +2114,7 @@ looks_like_rpc_reply(tvbuff_t *tvb, packet_info *pinfo, int offset) because there's no guarantee that the call was sent to the address from which the reply came. We also don't worry about the port *to* which the reply was - sent, because some clients (*cough* OS X NFS client + sent, because some clients (*cough* macOS NFS client *cough*) might send retransmissions from a different port from the original request, so replies to the original call and a retransmission of the call diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 563dcebdc6..69cf7b6c10 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -11175,7 +11175,7 @@ proto_register_smb2(void) }, { &hf_smb2_aapl_server_query_caps_supports_osx_copyfile, - { "Supports OS X copyfile", "smb2.aapl.caps.supports_osx_copyfile", FT_BOOLEAN, 64, + { "Supports macOS copyfile", "smb2.aapl.caps.supports_osx_copyfile", FT_BOOLEAN, 64, NULL, SMB2_AAPL_SUPPORTS_OSX_COPYFILE, NULL, HFILL } }, |