- Added just another patch by Dave that fixes a reversed order in

  variable listing for output variables in cursor definitions
- Fixed incorrect if call in long=>numeric conversion.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
index 7a3875832ab..be1cb5f0b74 100644
--- a/src/interfaces/ecpg/preproc/variable.c
+++ b/src/interfaces/ecpg/preproc/variable.c
@@ -299,7 +299,7 @@ remove_variables(int brace_level)
 							prevvar->next = varptr->next;
 					}
 				}
-				for (varptr = ptr->argsresult; varptr != NULL; varptr = varptr->next)
+				for (varptr = prevvar = ptr->argsresult; varptr != NULL; varptr = varptr->next)
 				{
 					if (p == varptr->variable)
 					{
@@ -349,7 +349,7 @@ reset_variables(void)
  * Note: The list is dumped from the end,
  * so we have to add new entries at the beginning */
 void
-add_variable(struct arguments ** list, struct variable * var, struct variable * ind)
+add_variable_to_head(struct arguments ** list, struct variable * var, struct variable * ind)
 {
 	struct arguments *p = (struct arguments *) mm_alloc(sizeof(struct arguments));
 
@@ -361,7 +361,7 @@ add_variable(struct arguments ** list, struct variable * var, struct variable *
 
 /* Append a new variable to our request list. */
 void
-append_variable(struct arguments ** list, struct variable * var, struct variable * ind)
+add_variable_to_tail(struct arguments ** list, struct variable * var, struct variable * ind)
 {
 	struct arguments *p,
 			   *new = (struct arguments *) mm_alloc(sizeof(struct arguments));