diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-09-30 18:22:54 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-09-30 18:22:54 +0400 |
| commit | 08bc9e01c274a01d107b348f921e1c74dd04bd3a (patch) | |
| tree | 25348bff03c29d9dd6c6dd96bf82c7c9f9265ccf /src/uname.c | |
| parent | b9c7373f203ab77c58cb6b131f8b58236ea337a2 (diff) | |
| parent | c18578632fd3c9e513e613a86ba2b7c4ebee6c45 (diff) | |
| download | coreutils-08bc9e01c274a01d107b348f921e1c74dd04bd3a.tar.gz | |
Merge tag 'upstream/8.23'
Upstream version 8.23
Diffstat (limited to 'src/uname.c')
| -rw-r--r-- | src/uname.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/uname.c b/src/uname.c index cfcd0a33..e3bed488 100644 --- a/src/uname.c +++ b/src/uname.c @@ -1,6 +1,6 @@ /* uname -- print system information - Copyright (C) 1989-2013 Free Software Foundation, Inc. + Copyright (C) 1989-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -321,9 +321,9 @@ main (int argc, char **argv) if (element == unknown) { cpu_type_t cputype; - size_t s = sizeof cputype; + size_t cs = sizeof cputype; NXArchInfo const *ai; - if (sysctlbyname ("hw.cputype", &cputype, &s, NULL, 0) == 0 + if (sysctlbyname ("hw.cputype", &cputype, &cs, NULL, 0) == 0 && (ai = NXGetArchInfoFromCpuType (cputype, CPU_SUBTYPE_MULTIPLE)) != NULL) |