diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-10-09 12:47:40 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-10-09 12:47:40 +0000 |
| commit | f085c12fd72e4123f9915a97034d9d88b4874f9f (patch) | |
| tree | 320501134b7ea283554483156e30433dac40c766 /winsup | |
| parent | 509212aa98c5e38adb67481a079c9a09d3829f44 (diff) | |
| download | cygnal-f085c12fd72e4123f9915a97034d9d88b4874f9f.tar.gz cygnal-f085c12fd72e4123f9915a97034d9d88b4874f9f.tar.bz2 cygnal-f085c12fd72e4123f9915a97034d9d88b4874f9f.zip | |
* cygcheck.cc (dump_sysinfo): Convert "if/else if" chain to a switch
statement. Drop "not yet supported" and "Server" from Windows 2012
output string.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 24 |
2 files changed, 21 insertions, 9 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 9abd78ffe..fb650507b 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2012-10-09 Corinna Vinschen <corinna@vinschen.de> + + * cygcheck.cc (dump_sysinfo): Convert "if/else if" chain to a switch + statement. Drop "not yet supported" and "Server" from Windows 2012 + output string. + 2012-09-02 Corinna Vinschen <corinna@vinschen.de> * cygcheck.cc (dump_sysinfo): Drop "not yet supported" text from diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index f14574f9a..17c15fd38 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -1433,15 +1433,21 @@ dump_sysinfo () BOOL (WINAPI *GetProductInfo) (DWORD, DWORD, DWORD, DWORD, PDWORD) = (BOOL (WINAPI *)(DWORD, DWORD, DWORD, DWORD, PDWORD)) GetProcAddress (k32, "GetProductInfo"); - if (osversion.dwMinorVersion == 0) - strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION - ? "Vista" : "2008"); - else if (osversion.dwMinorVersion == 1) - strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION - ? "7" : "2008 R2"); - else if (osversion.dwMinorVersion == 2) - strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION - ? "8" : "Server 2012 (not yet supported!)"); + switch (osversion.dwMinorVersion) + { + case 0: + strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION + ? "Vista" : "2008"); + break; + case 1: + strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION + ? "7" : "2008 R2"); + break; + default: + strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION + ? "8" : "2012"); + break; + } DWORD prod; if (GetProductInfo (osversion.dwMajorVersion, osversion.dwMinorVersion, |