From 8baed2646a94d36cb2bf8259c8811edda93961d2 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 13 Jun 2015 11:24:39 -0400
Subject: [PATCH] Code cleanup

---
 src/appinterface.c | 110 ++++++++++++++++++++++-----------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/appinterface.c b/src/appinterface.c
index 02dab0a..cec1582 100644
--- a/src/appinterface.c
+++ b/src/appinterface.c
@@ -151,12 +151,12 @@ static int _string_enum(String const * string, StringEnum const * se)
 /* public */
 /* functions */
 /* appinterface_new */
-AppInterface * _new_do(AppTransportMode mode, char const * app);
-static int _new_foreach(char const * key, Hash * value,
-		AppInterface * appinterface);
 static int _new_append(AppInterface * ai, VariableType type,
 		char const * function);
 static int _new_append_arg(AppInterface * ai, char const * arg);
+AppInterface * _new_do(AppTransportMode mode, char const * app);
+static int _new_foreach(char const * key, Hash * value,
+		AppInterface * appinterface);
 
 AppInterface * appinterface_new(AppTransportMode mode, char const * app)
 {
@@ -186,6 +186,58 @@ AppInterface * appinterface_new(AppTransportMode mode, char const * app)
 	return ai;
 }
 
+static int _new_append(AppInterface * ai, VariableType type,
+		char const * function)
+{
+	AppInterfaceCall * p;
+
+#ifdef DEBUG
+	fprintf(stderr, "DEBUG: %s(%d, \"%s\")\n", __func__, type, function);
+#endif
+	if((p = realloc(ai->calls, sizeof(*p) * (ai->calls_cnt + 1))) == NULL)
+		return -1;
+	ai->calls = p;
+	p = &ai->calls[ai->calls_cnt];
+	if((p->name = string_new(function)) == NULL)
+		return -1;
+	p->type.type = type & AICT_MASK;
+	p->type.direction = type & AICD_MASK;
+	p->args = NULL;
+	p->args_cnt = 0;
+	ai->calls_cnt++;
+	return 0;
+}
+
+static int _new_append_arg(AppInterface * ai, char const * arg)
+{
+	char buf[16];
+	char * p;
+	int type;
+	AppInterfaceCall * q;
+	AppInterfaceCallArg * r;
+
+#ifdef DEBUG
+	fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, arg);
+#endif
+	snprintf(buf, sizeof(buf), "%s", arg);
+	if((p = strchr(buf, ',')) != NULL)
+		*p = '\0';
+	if((type = _string_enum(buf, _string_type)) < 0)
+		return -1;
+	q = &ai->calls[ai->calls_cnt - 1];
+	if((r = realloc(q->args, sizeof(*r) * (q->args_cnt + 1))) == NULL)
+		return error_set_code(-errno, "%s", strerror(errno));
+	q->args = r;
+	r = &q->args[q->args_cnt++];
+	r->type = type & AICT_MASK;
+	r->direction = type & AICD_MASK;
+#ifdef DEBUG
+	fprintf(stderr, "DEBUG: type %s, direction: %d\n", AICTString[r->type],
+			r->direction);
+#endif
+	return 0;
+}
+
 AppInterface * _new_do(AppTransportMode mode, char const * app)
 {
 	AppInterface * appinterface;
@@ -263,58 +315,6 @@ static int _new_foreach(char const * key, Hash * value,
 	return 0;
 }
 
-static int _new_append(AppInterface * ai, VariableType type,
-		char const * function)
-{
-	AppInterfaceCall * p;
-
-#ifdef DEBUG
-	fprintf(stderr, "DEBUG: %s(%d, \"%s\")\n", __func__, type, function);
-#endif
-	if((p = realloc(ai->calls, sizeof(*p) * (ai->calls_cnt + 1))) == NULL)
-		return -1;
-	ai->calls = p;
-	p = &ai->calls[ai->calls_cnt];
-	if((p->name = string_new(function)) == NULL)
-		return -1;
-	p->type.type = type & AICT_MASK;
-	p->type.direction = type & AICD_MASK;
-	p->args = NULL;
-	p->args_cnt = 0;
-	ai->calls_cnt++;
-	return 0;
-}
-
-static int _new_append_arg(AppInterface * ai, char const * arg)
-{
-	char buf[16];
-	char * p;
-	int type;
-	AppInterfaceCall * q;
-	AppInterfaceCallArg * r;
-
-#ifdef DEBUG
-	fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, arg);
-#endif
-	snprintf(buf, sizeof(buf), "%s", arg);
-	if((p = strchr(buf, ',')) != NULL)
-		*p = '\0';
-	if((type = _string_enum(buf, _string_type)) < 0)
-		return -1;
-	q = &ai->calls[ai->calls_cnt - 1];
-	if((r = realloc(q->args, sizeof(*r) * (q->args_cnt + 1))) == NULL)
-		return error_set_code(-errno, "%s", strerror(errno));
-	q->args = r;
-	r = &q->args[q->args_cnt++];
-	r->type = type & AICT_MASK;
-	r->direction = type & AICD_MASK;
-#ifdef DEBUG
-	fprintf(stderr, "DEBUG: type %s, direction: %d\n", AICTString[r->type],
-			r->direction);
-#endif
-	return 0;
-}
-
 
 /* appinterface_delete */
 void appinterface_delete(AppInterface * appinterface)