diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/cash.c | 13 | ||||
| -rw-r--r-- | src/pl/plperl/SPI.xs | 6 | ||||
| -rw-r--r-- | src/pl/plperl/plperl.c | 6 |
3 files changed, 4 insertions, 21 deletions
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index f9e2f10325a..a57cba0073a 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.66 2005/10/15 02:49:28 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.67 2006/03/19 22:22:56 neilc Exp $ */ #include "postgres.h" @@ -291,10 +291,7 @@ cash_out(PG_FUNCTION_ARGS) /* see if we need to signify negative amount */ if (minus) { - if (!PointerIsValid(result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol)))) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); + result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol)); /* Position code of 0 means use parens */ if (convention == 0) @@ -306,11 +303,7 @@ cash_out(PG_FUNCTION_ARGS) } else { - if (!PointerIsValid(result = palloc(CASH_BUFSZ + 2 - count))) - ereport(ERROR, - (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("out of memory"))); - + result = palloc(CASH_BUFSZ + 2 - count); strcpy(result, buf + count); } diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs index 738cbb61842..967ac0adbab 100644 --- a/src/pl/plperl/SPI.xs +++ b/src/pl/plperl/SPI.xs @@ -151,8 +151,6 @@ spi_spi_prepare(query, ...) if (items < 1) Perl_croak(aTHX_ "Usage: spi_prepare(query, ...)"); argv = ( SV**) palloc(( items - 1) * sizeof(SV*)); - if ( argv == NULL) - Perl_croak(aTHX_ "spi_prepare: not enough memory"); for ( i = 1; i < items; i++) argv[i - 1] = ST(i); RETVAL = plperl_spi_prepare(query, items - 1, argv); @@ -179,8 +177,6 @@ spi_spi_exec_prepared(query, ...) } argc = items - offset; argv = ( SV**) palloc( argc * sizeof(SV*)); - if ( argv == NULL) - Perl_croak(aTHX_ "spi_exec_prepared: not enough memory"); for ( i = 0; offset < items; offset++, i++) argv[i] = ST(offset); ret_hash = plperl_spi_exec_prepared(query, attr, argc, argv); @@ -199,8 +195,6 @@ spi_spi_query_prepared(query, ...) Perl_croak(aTHX_ "Usage: spi_query_prepared(query, " "[\\@bind_values])"); argv = ( SV**) palloc(( items - 1) * sizeof(SV*)); - if ( argv == NULL) - Perl_croak(aTHX_ "spi_query_prepared: not enough memory"); for ( i = 1; i < items; i++) argv[i - 1] = ST(i); RETVAL = plperl_spi_query_prepared(query, items - 1, argv); diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 362bf774725..0524d9ebe4e 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1,7 +1,7 @@ /********************************************************************** * plperl.c - perl as a procedural language for PostgreSQL * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.106 2006/03/14 22:48:23 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.107 2006/03/19 22:22:56 neilc Exp $ * **********************************************************************/ @@ -2122,8 +2122,6 @@ plperl_spi_exec_prepared(char* query, HV * attr, int argc, SV ** argv) { nulls = (char *)palloc( argc); argvalues = (Datum *) palloc(argc * sizeof(Datum)); - if ( nulls == NULL || argvalues == NULL) - elog(ERROR, "spi_exec_prepared: not enough memory"); } else { @@ -2253,8 +2251,6 @@ plperl_spi_query_prepared(char* query, int argc, SV ** argv) { nulls = (char *)palloc( argc); argvalues = (Datum *) palloc(argc * sizeof(Datum)); - if ( nulls == NULL || argvalues == NULL) - elog(ERROR, "spi_query_prepared: not enough memory"); } else { |