diff options
| author | Neil Conway <neilc@samurai.com> | 2004-10-25 00:46:43 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-10-25 00:46:43 +0000 |
| commit | 8ec05b28b712fa4b2de5cc088ee978e05cd7e69a (patch) | |
| tree | 3220f2edfd254450493b1977d8a1f374f93f70d4 /src/backend/utils | |
| parent | 346aff04be3311cefc0570022f86d43622d85f5e (diff) | |
| download | postgresql-8ec05b28b712fa4b2de5cc088ee978e05cd7e69a.tar.gz | |
Modify hash_create() to elog(ERROR) if an error occurs, rather than
returning a NULL pointer (some callers remembered to check the return
value, but some did not -- it is safer to just bail out).
Also, cleanup pgstat.c to use elog(ERROR) rather than elog(LOG) followed
by exit().
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/fmgr/fmgr.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/hash/dynahash.c | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index b3f6ec0f5e..b151edd633 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.85 2004/10/01 20:39:54 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.86 2004/10/25 00:46:42 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -515,10 +515,6 @@ record_C_func(HeapTuple procedureTuple, 100, &hash_ctl, HASH_ELEM | HASH_FUNCTION); - if (CFuncHash == NULL) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); } entry = (CFuncHashTabEntry *) diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 020589ba7b..cf4e60e3c4 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.55 2004/10/22 07:21:06 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.56 2004/10/25 00:46:43 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -120,8 +120,6 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags) /* Initialize the hash header */ hashp = (HTAB *) MEM_ALLOC(sizeof(HTAB)); - if (!hashp) - return NULL; MemSet(hashp, 0, sizeof(HTAB)); hashp->tabname = (char *) MEM_ALLOC(strlen(tabname) + 1); @@ -175,7 +173,9 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags) { hashp->hctl = (HASHHDR *) hashp->alloc(sizeof(HASHHDR)); if (!hashp->hctl) - return NULL; + ereport(ERROR, + (errcode(ERRCODE_OUT_OF_MEMORY), + errmsg("out of memory"))); } hdefault(hashp); @@ -231,7 +231,7 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags) if (!init_htab(hashp, nelem)) { hash_destroy(hashp); - return NULL; + elog(ERROR, "failed to initialize hash table"); } /* @@ -243,7 +243,9 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags) if (!element_alloc(hashp, (int) nelem)) { hash_destroy(hashp); - return NULL; + ereport(ERROR, + (errcode(ERRCODE_OUT_OF_MEMORY), + errmsg("out of memory"))); } } |