diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /src/os/os_alloc.c | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'src/os/os_alloc.c')
| -rw-r--r-- | src/os/os_alloc.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/os/os_alloc.c b/src/os/os_alloc.c index fb7bf109..478924df 100644 --- a/src/os/os_alloc.c +++ b/src/os/os_alloc.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -11,7 +11,7 @@ #include "db_int.h" #ifdef DIAGNOSTIC -static void __os_guard __P((ENV *)); +static void __os_guard __P((const ENV *)); typedef union { size_t size; @@ -204,11 +204,11 @@ __os_strdup(env, str, storep) * __os_calloc -- * The calloc(3) function for DB. * - * PUBLIC: int __os_calloc __P((ENV *, size_t, size_t, void *)); + * PUBLIC: int __os_calloc __P((const ENV *, size_t, size_t, void *)); */ int __os_calloc(env, num, size, storep) - ENV *env; + const ENV *env; size_t num, size; void *storep; { @@ -227,11 +227,11 @@ __os_calloc(env, num, size, storep) * __os_malloc -- * The malloc(3) function for DB. * - * PUBLIC: int __os_malloc __P((ENV *, size_t, void *)); + * PUBLIC: int __os_malloc __P((const ENV *, size_t, void *)); */ int __os_malloc(env, size, storep) - ENV *env; + const ENV *env; size_t size; void *storep; { @@ -261,9 +261,11 @@ __os_malloc(env, size, storep) * Windows/NT in an MT environment. */ if ((ret = __os_get_errno_ret_zero()) == 0) { - ret = ENOMEM; + ret = USR_ERR(env, ENOMEM); __os_set_errno(ENOMEM); } + else + (void)USR_ERR(env, ret); __db_err(env, ret, DB_STR_A("0147", "malloc: %lu", "%lu"), (u_long)size); return (ret); @@ -292,11 +294,11 @@ __os_malloc(env, size, storep) * __os_realloc -- * The realloc(3) function for DB. * - * PUBLIC: int __os_realloc __P((ENV *, size_t, void *)); + * PUBLIC: int __os_realloc __P((const ENV *, size_t, void *)); */ int __os_realloc(env, size, storep) - ENV *env; + const ENV *env; size_t size; void *storep; { @@ -345,7 +347,7 @@ __os_realloc(env, size, storep) * Windows/NT in an MT environment. */ if ((ret = __os_get_errno_ret_zero()) == 0) { - ret = ENOMEM; + ret = USR_ERR(env, ENOMEM); __os_set_errno(ENOMEM); } __db_err(env, ret, DB_STR_A("0148", "realloc: %lu", "%lu"), @@ -368,11 +370,11 @@ __os_realloc(env, size, storep) * __os_free -- * The free(3) function for DB. * - * PUBLIC: void __os_free __P((ENV *, void *)); + * PUBLIC: void __os_free __P((const ENV *, void *)); */ void __os_free(env, ptr) - ENV *env; + const ENV *env; void *ptr; { #ifdef DIAGNOSTIC @@ -416,7 +418,7 @@ __os_free(env, ptr) */ static void __os_guard(env) - ENV *env; + const ENV *env; { __db_errx(env, DB_STR("0149", "Guard byte incorrect during free")); |