From 77acab75dfe2e4741c25c0cf550266caef1eebd2 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 28 Apr 2010 16:54:16 +0000 Subject: Modify ShmemInitStruct and ShmemInitHash to throw errors internally, rather than returning NULL for some-but-not-all failures as they used to. Remove now-redundant tests for NULL from call sites. We had to do something about this because many call sites were failing to check for NULL; and changing it like this seems a lot more useful and mistake-proof than adding checks to the call sites without them. --- contrib/pg_stat_statements/pg_stat_statements.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 8fa249e9b8..eb89aeca80 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -14,7 +14,7 @@ * Copyright (c) 2008-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.13 2010/02/26 02:00:32 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.14 2010/04/28 16:54:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -321,8 +321,6 @@ pgss_shmem_startup(void) pgss = ShmemInitStruct("pg_stat_statements", sizeof(pgssSharedState), &found); - if (!pgss) - elog(ERROR, "out of shared memory"); if (!found) { @@ -343,8 +341,6 @@ pgss_shmem_startup(void) pgss_max, pgss_max, &info, HASH_ELEM | HASH_FUNCTION | HASH_COMPARE); - if (!pgss_hash) - elog(ERROR, "out of shared memory"); LWLockRelease(AddinShmemInitLock); -- cgit v1.2.1