1 files changed, 54 insertions, 50 deletions

diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c
index e55aa886cf8..792b286d8c0 100644
--- a/src/interfaces/ecpg/preproc/descriptor.c
+++ b/src/interfaces/ecpg/preproc/descriptor.c
@@ -3,18 +3,19 @@
  */
 
 #include "postgres.h"
-#include "extern.h" 
+#include "extern.h"
 
 /*
  * assignment handling function (descriptor)
  */
- 
+
 struct assignment *assignments;
 
-void push_assignment(char *var, enum ECPGdtype value)
+void
+push_assignment(char *var, enum ECPGdtype value)
 {
-	struct assignment *new = (struct assignment *)mm_alloc(sizeof(struct assignment));
-	
+	struct assignment *new = (struct assignment *) mm_alloc(sizeof(struct assignment));
+
 	new->next = assignments;
 	new->variable = mm_alloc(strlen(var) + 1);
 	strcpy(new->variable, var);
@@ -35,91 +36,94 @@ drop_assignments(void)
 	}
 }
 
-static void ECPGnumeric_lvalue(FILE *f,char *name)
+static void
+ECPGnumeric_lvalue(FILE *f, char *name)
 {
-	const struct variable *v=find_variable(name);
+	const struct variable *v = find_variable(name);
 
-	switch(v->type->typ)
+	switch (v->type->typ)
 	{
 		case ECPGt_short:
-		case ECPGt_int: 
+		case ECPGt_int:
 		case ECPGt_long:
 		case ECPGt_unsigned_short:
 		case ECPGt_unsigned_int:
 		case ECPGt_unsigned_long:
-			fputs(name,yyout);
+			fputs(name, yyout);
 			break;
 		default:
-			snprintf(errortext,sizeof errortext,"variable %s: numeric type needed"
-					,name);
-			mmerror(ET_ERROR,errortext);
+			snprintf(errortext, sizeof errortext, "variable %s: numeric type needed"
+					 ,name);
+			mmerror(ET_ERROR, errortext);
 			break;
-	}	 
+	}
 }
 
 /*
  * descriptor name lookup
  */
- 
+
 static struct descriptor *descriptors;
 
-void add_descriptor(char *name,char *connection)
+void
+add_descriptor(char *name, char *connection)
 {
-	struct descriptor *new = (struct descriptor *)mm_alloc(sizeof(struct descriptor));
-	
+	struct descriptor *new = (struct descriptor *) mm_alloc(sizeof(struct descriptor));
+
 	new->next = descriptors;
 	new->name = mm_alloc(strlen(name) + 1);
-	strcpy(new->name,name);
-	if (connection) 
+	strcpy(new->name, name);
+	if (connection)
 	{
 		new->connection = mm_alloc(strlen(connection) + 1);
 		strcpy(new->connection, connection);
 	}
-	else new->connection = connection;
+	else
+		new->connection = connection;
 	descriptors = new;
 }
 
 void
-drop_descriptor(char *name,char *connection)
+drop_descriptor(char *name, char *connection)
 {
 	struct descriptor *i;
-	struct descriptor **lastptr=&descriptors;
-	
-	for (i=descriptors;i;lastptr=&i->next,i=i->next)
+	struct descriptor **lastptr = &descriptors;
+
+	for (i = descriptors; i; lastptr = &i->next, i = i->next)
 	{
-		if (!strcmp(name,i->name))
+		if (!strcmp(name, i->name))
 		{
-			if ((!connection && !i->connection) 
-				|| (connection && i->connection 
-					&& !strcmp(connection,i->connection)))
+			if ((!connection && !i->connection)
+				|| (connection && i->connection
+					&& !strcmp(connection, i->connection)))
 			{
-				*lastptr=i->next;
-				if (i->connection) free(i->connection);
+				*lastptr = i->next;
+				if (i->connection)
+					free(i->connection);
 				free(i->name);
 				free(i);
 				return;
 			}
 		}
 	}
-	snprintf(errortext,sizeof errortext,"unknown descriptor %s",name);
-	mmerror(ET_WARN,errortext);
+	snprintf(errortext, sizeof errortext, "unknown descriptor %s", name);
+	mmerror(ET_WARN, errortext);
 }
 
 struct descriptor
-*lookup_descriptor(char *name, char *connection)
+		   *
+lookup_descriptor(char *name, char *connection)
 {
 	struct descriptor *i;
-	
+
 	for (i = descriptors; i; i = i->next)
 	{
 		if (!strcmp(name, i->name))
 		{
-			if ((!connection && !i->connection) 
-				|| (connection && i->connection 
-					&& !strcmp(connection,i->connection)))
-			{
+			if ((!connection && !i->connection)
+				|| (connection && i->connection
+					&& !strcmp(connection, i->connection)))
 				return i;
-			}
 		}
 	}
 	snprintf(errortext, sizeof errortext, "unknown descriptor %s", name);
@@ -136,14 +140,14 @@ output_get_descr_header(char *desc_name)
 	for (results = assignments; results != NULL; results = results->next)
 	{
 		if (results->value == ECPGd_count)
-			ECPGnumeric_lvalue(yyout,results->variable);
+			ECPGnumeric_lvalue(yyout, results->variable);
 		else
 		{
 			snprintf(errortext, sizeof errortext, "unknown descriptor header item '%d'", results->value);
 			mmerror(ET_WARN, errortext);
 		}
 	}
-	
+
 	drop_assignments();
 	fprintf(yyout, "));\n");
 	whenever_action(3);
@@ -154,27 +158,27 @@ output_get_descr(char *desc_name, char *index)
 {
 	struct assignment *results;
 
-	fprintf(yyout, "{ ECPGget_desc(%d,\"%s\",%s,", yylineno, desc_name, index);	
+	fprintf(yyout, "{ ECPGget_desc(%d,\"%s\",%s,", yylineno, desc_name, index);
 	for (results = assignments; results != NULL; results = results->next)
 	{
 		const struct variable *v = find_variable(results->variable);
-		
+
 		switch (results->value)
 		{
 			case ECPGd_nullable:
-				mmerror(ET_WARN,"nullable is always 1");
+				mmerror(ET_WARN, "nullable is always 1");
 				break;
 			case ECPGd_key_member:
-				mmerror(ET_WARN,"key_member is always 0");
+				mmerror(ET_WARN, "key_member is always 0");
 				break;
 			default:
-				break; 
+				break;
 		}
 		fprintf(yyout, "%s,", get_dtype(results->value));
 		ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL);
 	}
 	drop_assignments();
-	fputs("ECPGd_EODT);\n",yyout);
-	
-	whenever_action(2|1);
+	fputs("ECPGd_EODT);\n", yyout);
+
+	whenever_action(2 | 1);
 }