diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-03 11:34:37 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-03 11:34:37 +0000 |
| commit | 9eb15fd4eaf927b4fba117acb4780893c7f80d58 (patch) | |
| tree | 2c9ea29f8f8c2a7c4f63ba201d17edc53707eab0 /usr/src/lib/libc | |
| parent | c8b1af2f9d2e9ff2962021a5c7b4b0fdd6166cd1 (diff) | |
| parent | 48184658ed4905003a64891adfd0c0a4bd726b78 (diff) | |
| download | illumos-joyent-9eb15fd4eaf927b4fba117acb4780893c7f80d58.tar.gz | |
[illumos-gate merge]
commit 48184658ed4905003a64891adfd0c0a4bd726b78
7927 Penv_iter(3proc): Typos in the man page
commit d8e39ab6c370c9510b10d53c0ebf82294af4aede
7892 loader.efi: Add defines needed to export SMBIOS serial numbers
commit 6fec69aa7d808587436432f75023de288451324f
7788 loader: zfs boot should check for provided fstype
commit f24aa11fb7f6343b7e687fa57ee8997cc55e2883
7860 libc: indentation errors
commit f1cc607eb9fe881d3fa29a24921e6ba1b64eb7fb
7901 Devices that do not support setting WC keep generating ereports
commit 20d4f984477a2a115e362365dc6f201b59a14d27
7894 loader: Stop closing the network device when netbooting for loaders using the common dev_net.c code
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/amd64/gen/proc64_id.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/ttyname.c | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/usr/src/lib/libc/amd64/gen/proc64_id.c b/usr/src/lib/libc/amd64/gen/proc64_id.c index 656244b4ad..502f49748b 100644 --- a/usr/src/lib/libc/amd64/gen/proc64_id.c +++ b/usr/src/lib/libc/amd64/gen/proc64_id.c @@ -154,11 +154,12 @@ get_amd_cache_info(void) * L3 is a victim cache for L2 */ largest_level_cache += l2_cache_size; - } else + } else { largest_level_cache = l2_cache_size; + } - __set_cache_sizes(l1_cache_size, l2_cache_size, - largest_level_cache); + __set_cache_sizes(l1_cache_size, l2_cache_size, + largest_level_cache); } /* diff --git a/usr/src/lib/libc/port/gen/ttyname.c b/usr/src/lib/libc/port/gen/ttyname.c index 01a4ea8cb7..d5c321a824 100644 --- a/usr/src/lib/libc/port/gen/ttyname.c +++ b/usr/src/lib/libc/port/gen/ttyname.c @@ -475,10 +475,10 @@ itoa(int i, char *ptr) static int srch_dir(const entry_t path, /* current path */ - int match_mask, /* flags mask */ - int depth, /* current depth (/dev = 0) */ - const entry_t skip_dirs[], /* directories not needing searching */ - struct stat64 *fsb) /* the file being searched for */ + int match_mask, /* flags mask */ + int depth, /* current depth (/dev = 0) */ + const entry_t skip_dirs[], /* directories not needing searching */ + struct stat64 *fsb) /* the file being searched for */ { DIR *dirp; struct dirent64 *direntp; @@ -692,10 +692,11 @@ get_pri_dirs(void) state = COMMENT_STATE; break; } - if (!isspace(*buf)) /* skip leading white space */ + if (!isspace(*buf)) { /* skip leading white space */ state = DIRNAME_STATE; vec->name = buf; vec->flags = 0; + } break; case COMMENT_STATE: |