diff options
Diffstat (limited to 'src/lib/libc/stdlib')
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 14 | ||||
-rw-r--r-- | src/lib/libc/stdlib/setenv.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 0296985e5b..20807a25b4 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: malloc.c,v 1.196 2016/09/18 13:46:28 otto Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.197 2016/09/21 04:38:56 guenther Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> |
4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> | 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> |
@@ -83,14 +83,14 @@ | |||
83 | #define SOME_JUNK 0xd0 /* as in "Duh" :-) */ | 83 | #define SOME_JUNK 0xd0 /* as in "Duh" :-) */ |
84 | #define SOME_FREEJUNK 0xdf | 84 | #define SOME_FREEJUNK 0xdf |
85 | 85 | ||
86 | #define MMAP(sz) mmap(NULL, (size_t)(sz), PROT_READ | PROT_WRITE, \ | 86 | #define MMAP(sz) mmap(NULL, (sz), PROT_READ | PROT_WRITE, \ |
87 | MAP_ANON | MAP_PRIVATE, -1, (off_t) 0) | 87 | MAP_ANON | MAP_PRIVATE, -1, 0) |
88 | 88 | ||
89 | #define MMAPA(a,sz) mmap((a), (size_t)(sz), PROT_READ | PROT_WRITE, \ | 89 | #define MMAPA(a,sz) mmap((a), (sz), PROT_READ | PROT_WRITE, \ |
90 | MAP_ANON | MAP_PRIVATE, -1, (off_t) 0) | 90 | MAP_ANON | MAP_PRIVATE, -1, 0) |
91 | 91 | ||
92 | #define MQUERY(a, sz) mquery((a), (size_t)(sz), PROT_READ | PROT_WRITE, \ | 92 | #define MQUERY(a, sz) mquery((a), (sz), PROT_READ | PROT_WRITE, \ |
93 | MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, (off_t)0) | 93 | MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0) |
94 | 94 | ||
95 | struct region_info { | 95 | struct region_info { |
96 | void *p; /* page; low bits used to mark chunks */ | 96 | void *p; /* page; low bits used to mark chunks */ |
diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c index 60c2cd46a6..15c550ba30 100644 --- a/src/lib/libc/stdlib/setenv.c +++ b/src/lib/libc/stdlib/setenv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: setenv.c,v 1.18 2016/04/25 21:36:04 millert Exp $ */ | 1 | /* $OpenBSD: setenv.c,v 1.19 2016/09/21 04:38:56 guenther Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1987 Regents of the University of California. | 3 | * Copyright (c) 1987 Regents of the University of California. |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -141,7 +141,7 @@ setenv(const char *name, const char *value, int rewrite) | |||
141 | environ[cnt + 1] = NULL; | 141 | environ[cnt + 1] = NULL; |
142 | } | 142 | } |
143 | if (!(environ[offset] = /* name + `=' + value */ | 143 | if (!(environ[offset] = /* name + `=' + value */ |
144 | malloc((size_t)((int)(np - name) + l_value + 2)))) | 144 | malloc((int)(np - name) + l_value + 2))) |
145 | return (-1); | 145 | return (-1); |
146 | for (C = environ[offset]; (*C = *name++) && *C != '='; ++C) | 146 | for (C = environ[offset]; (*C = *name++) && *C != '='; ++C) |
147 | ; | 147 | ; |