From 4603ceb885c477234a77b0778bc93ef396a73e82 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 24 Jul 2011 23:46:10 -0500
Subject: [PATCH] main: split out to main.c, make pretty printers hidden

---
 Makefile |  2 +-
 main.c   | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pkg.c    | 37 +----------------------------------
 3 files changed, 61 insertions(+), 37 deletions(-)
 create mode 100644 main.c

diff --git a/Makefile b/Makefile
index edf4fb5..cd60966 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PROG		= pkgconf${PROG_SUFFIX}
-SRCS		= parse.c pkg.c
+SRCS		= main.c parse.c pkg.c
 LIBS		= -lpopt
 
 include buildsys.mk
diff --git a/main.c b/main.c
new file mode 100644
index 0000000..cef9674
--- /dev/null
+++ b/main.c
@@ -0,0 +1,59 @@
+/*
+ * main.c
+ * main() routine, printer functions
+ *
+ * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "pkg.h"
+
+static void
+print_cflags(pkg_t *pkg, void *unused)
+{
+	if (pkg->cflags != NULL)
+		printf("%s ", pkg->cflags);
+}
+
+static void
+print_libs(pkg_t *pkg, void *unused)
+{
+	if (pkg->libs != NULL)
+		printf("%s ", pkg->libs);
+}
+
+int
+main(int argc, const char *argv[])
+{
+	pkg_t *pkg;
+
+	pkg = pkg_find(argv[1]);
+	if (pkg)
+	{
+		pkg_traverse(pkg, print_cflags, NULL);
+		pkg_traverse(pkg, print_libs, NULL);
+		printf("\n");
+	}
+	else
+	{
+		printf("%s not found\n", argv[1]);
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/pkg.c b/pkg.c
index aade3a3..bb3afca 100644
--- a/pkg.c
+++ b/pkg.c
@@ -1,6 +1,6 @@
 /*
  * pkg.c
- * main() routine and basic dependency solving...
+ * higher-level dependency graph compilation, management and manipulation
  *
  * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>.
  *
@@ -56,38 +56,3 @@ pkg_traverse(pkg_t *root,
 
 	pkg_traverse_func(root, data);
 }
-
-void
-print_cflags(pkg_t *pkg, void *unused)
-{
-	if (pkg->cflags != NULL)
-		printf("%s ", pkg->cflags);
-}
-
-void
-print_libs(pkg_t *pkg, void *unused)
-{
-	if (pkg->libs != NULL)
-		printf("%s ", pkg->libs);
-}
-
-int main(int argc, const char *argv[])
-{
-	pkg_t *pkg;
-
-	pkg = pkg_find(argv[1]);
-	if (pkg)
-	{
-		pkg_traverse(pkg, print_cflags, NULL);
-		pkg_traverse(pkg, print_libs, NULL);
-		printf("\n");
-	}
-	else
-	{
-		printf("%s not found\n", argv[1]);
-		return -1;
-	}
-
-	return 0;
-}
-