Commit 8f65c02f authored by Alvaro Herrera's avatar Alvaro Herrera

Remove the currently unused FRONTEND case in dllist.c. This allows the usage

of palloc instead of malloc, which means a list can be freed simply by deleting
the memory context that contains it.
parent bb8998a4
...@@ -9,19 +9,11 @@ ...@@ -9,19 +9,11 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.34 2007/01/05 22:19:29 momjian Exp $ * $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.35 2007/03/22 18:57:52 alvherre Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
/* can be used in frontend or backend */
#ifdef FRONTEND
#include "postgres_fe.h"
/* No assert checks in frontend ... */
#define Assert(condition)
#else
#include "postgres.h" #include "postgres.h"
#endif
#include "lib/dllist.h" #include "lib/dllist.h"
...@@ -31,18 +23,8 @@ DLNewList(void) ...@@ -31,18 +23,8 @@ DLNewList(void)
{ {
Dllist *l; Dllist *l;
l = (Dllist *) malloc(sizeof(Dllist)); l = (Dllist *) palloc(sizeof(Dllist));
if (l == NULL)
{
#ifdef FRONTEND
fprintf(stderr, "memory exhausted in DLNewList\n");
exit(1);
#else
ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory")));
#endif
}
l->dll_head = NULL; l->dll_head = NULL;
l->dll_tail = NULL; l->dll_tail = NULL;
...@@ -66,9 +48,9 @@ DLFreeList(Dllist *list) ...@@ -66,9 +48,9 @@ DLFreeList(Dllist *list)
Dlelem *curr; Dlelem *curr;
while ((curr = DLRemHead(list)) != NULL) while ((curr = DLRemHead(list)) != NULL)
free(curr); pfree(curr);
free(list); pfree(list);
} }
Dlelem * Dlelem *
...@@ -76,18 +58,8 @@ DLNewElem(void *val) ...@@ -76,18 +58,8 @@ DLNewElem(void *val)
{ {
Dlelem *e; Dlelem *e;
e = (Dlelem *) malloc(sizeof(Dlelem)); e = (Dlelem *) palloc(sizeof(Dlelem));
if (e == NULL)
{
#ifdef FRONTEND
fprintf(stderr, "memory exhausted in DLNewElem\n");
exit(1);
#else
ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory")));
#endif
}
e->dle_next = NULL; e->dle_next = NULL;
e->dle_prev = NULL; e->dle_prev = NULL;
e->dle_val = val; e->dle_val = val;
...@@ -107,7 +79,7 @@ DLInitElem(Dlelem *e, void *val) ...@@ -107,7 +79,7 @@ DLInitElem(Dlelem *e, void *val)
void void
DLFreeElem(Dlelem *e) DLFreeElem(Dlelem *e)
{ {
free(e); pfree(e);
} }
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment