diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-16 00:57:54 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-16 07:58:36 +0000 |
| commit | 3e828e898cdb8fa89673074289dbd58668590522 (patch) | |
| tree | c49a1e25225354703957597b1efd78389313390b | |
| parent | d802138333a2fc4a838b10deeaa6c0551b3b66b1 (diff) | |
| download | wireshark-3e828e898cdb8fa89673074289dbd58668590522.tar.gz | |
Rename a routine to match the OS name.
It's now "macOS".
While we're at it, note that the property list from which it fetches
version information still calls it "Mac OS X".
Change-Id: I438ef9dc65c2619d7378b0deb5efc84734a2ac6d
Reviewed-on: https://code.wireshark.org/review/22159
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 63b91ad3119c64eb8fdaa67303fe37d71a01a1b0)
Reviewed-on: https://code.wireshark.org/review/22160
| -rw-r--r-- | wsutil/os_version_info.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c index 0c8b955676..cbd4025ead 100644 --- a/wsutil/os_version_info.c +++ b/wsutil/os_version_info.c @@ -73,9 +73,12 @@ get_string_from_dictionary(CFPropertyListRef dict, CFStringRef key) /* * Get the macOS version information, and append it to the GString. * Return TRUE if we succeed, FALSE if we fail. + * + * XXX - this gives the OS name as "Mac OS X" even if Apple called/calls + * it "OS X" or "macOS". */ static gboolean -get_os_x_version_info(GString *str) +get_macos_version_info(GString *str) { static const UInt8 server_version_plist_path[] = "/System/Library/CoreServices/ServerVersion.plist"; @@ -440,7 +443,7 @@ get_os_version_info(GString *str) * version if we can, and put the Darwin information * in parentheses. */ - if (get_os_x_version_info(str)) { + if (get_macos_version_info(str)) { /* Success - append the Darwin information. */ g_string_append_printf(str, " (%s %s)", name.sysname, name.release); } else { |