KNF

Makefile.am

@@ -16,7 +16,7 @@ bgpq4_SOURCES=main.c extern.h printer.c expander.c \
     sx_maxsockbuf.c \
     sx_prefix.c sx_prefix.h \
     sx_report.c sx_report.h \
-    sx_slentry.c sx_slentry.h
+    sx_slentry.c
 
 
 EXTRA_DIST=bootstrap README.md CHANGES bgpq4.spec

extern.h

@@ -25,9 +25,23 @@
  */
 
 #include <sys/queue.h>
+#include <sys/tree.h>
 
 #include "sx_prefix.h"
-#include "sx_slentry.h"
+
+struct sx_slentry {
+	STAILQ_ENTRY(sx_slentry) entries;
+	char*  text;
+};
+
+struct sx_slentry* sx_slentry_new(char* text);
+
+struct sx_tentry {
+	RB_ENTRY(sx_tentry) entries;
+	char* text;
+};
+
+struct sx_tentry* sx_tentry_new(char* text);
 
 typedef enum {
 	V_CISCO = 0,

sx_prefix.h

@@ -78,8 +78,8 @@ int sx_prefix_fprint(FILE* f, struct sx_prefix* p);
 int sx_prefix_snprintf(struct sx_prefix *p, char *rbuffer, int srb);
 int sx_prefix_snprintf_sep(struct sx_prefix *p, char *rbuffer, int srb, char *);
 void sx_prefix_snprintf_fmt(struct sx_prefix *p, FILE *f,
-	const char* name, const char* fmt,
-	unsigned int aggregateLow, unsigned int aggregateHi);
+    const char *name, const char *fmt, unsigned int aggregateLow,
+    unsigned int aggregateHi);
 int sx_prefix_jsnprintf(struct sx_prefix *p, char *rbuffer, int srb);
 struct sx_radix_tree *sx_radix_tree_new(int af);
 struct sx_radix_node *sx_radix_node_new(struct sx_prefix *prefix);

sx_slentry.c

@@ -28,7 +28,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include "sx_slentry.h"
+#include "extern.h"
 
 struct sx_slentry *
 sx_slentry_new(char *t)