database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Ecpglib stores variables that are used in DECLARE statements in a global list.

Browse Source 
This list is now freed when the last connection has been closed.

Closes: #6366
This commit is contained in:
Michael Meskes 2012-01-05 14:08:45 +01:00
parent dfd26f9c5f
commit 8cf82ac53e
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/ecpg/ecpglib/connect.c
View File

@ -149,6 +149,13 @@ ecpg_finish(struct connection * act)
for (cache = act->cache_head; cache; ptr = cache, cache = cache->next, ecpg_free(ptr)); for (cache = act->cache_head; cache; ptr = cache, cache = cache->next, ecpg_free(ptr));
ecpg_free(act->name); ecpg_free(act->name);
ecpg_free(act); ecpg_free(act);
/* delete cursor variables when last connection gets closed */
if (all_connections == NULL)
{
struct var_list *iv_ptr;
for (; ivlist; iv_ptr = ivlist, ivlist = ivlist->next, ecpg_free(iv_ptr));
}
} }
else else
ecpg_log("ecpg_finish: called an extra time\n"); ecpg_log("ecpg_finish: called an extra time\n");

9
src/interfaces/ecpg/ecpglib/extern.h
View File

@ -121,6 +121,15 @@ struct variable
struct variable *next; struct variable *next;
}; };
struct var_list
{
int number;
void *pointer;
struct var_list *next;
};
extern struct var_list *ivlist;
/* Here are some methods used by the lib. */ /* Here are some methods used by the lib. */
/* Returns a pointer to a string containing a simple type name. */ /* Returns a pointer to a string containing a simple type name. */

7
src/interfaces/ecpg/ecpglib/misc.c
View File

@ -501,12 +501,7 @@ ecpg_gettext(const char *msgid)
} }
#endif /* ENABLE_NLS */ #endif /* ENABLE_NLS */
static struct var_list struct var_list *ivlist = NULL;
{
int number;
void *pointer;
struct var_list *next;
} *ivlist = NULL;
void void
ECPGset_var(int number, void *pointer, int lineno) ECPGset_var(int number, void *pointer, int lineno)