Patchwork [3/9] petitboot: Move log to library

login
register
mail settings
Submitter Geoff Levand
Date Jan. 22, 2009, 12:26 a.m.
Message ID <20090122002653.397608973@am.sony.com>
Download mbox | patch
Permalink /patch/19747/
State Accepted
Delegated to: Jeremy Kerr
Headers show

Comments

Geoff Levand - Jan. 22, 2009, 12:26 a.m.
Move the log routines to the petitboot library.  The log
routines are generic enough to be used for both server and
client.  Does not change the log source.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
---
 discover/log.c |   23 -----------------------
 discover/log.h |    9 ---------
 lib/log.c      |   23 +++++++++++++++++++++++
 lib/log.h      |    9 +++++++++
 rules.mk       |    9 +++++----
 5 files changed, 37 insertions(+), 36 deletions(-)

Patch

--- a/discover/log.c
+++ /dev/null
@@ -1,23 +0,0 @@ 
-
-#include <stdarg.h>
-
-#include "log.h"
-
-static FILE *logf;
-
-void pb_log(const char *fmt, ...)
-{
-	va_list ap;
-	FILE *stream;
-
-	stream = logf ? logf : stdout;
-
-	va_start(ap, fmt);
-	vfprintf(stream, fmt, ap);
-	va_end(ap);
-}
-
-void pb_log_set_stream(FILE *stream)
-{
-	logf = stream;
-}
--- a/discover/log.h
+++ /dev/null
@@ -1,9 +0,0 @@ 
-#ifndef _LOG_H
-#define _LOG_H
-
-#include <stdio.h>
-
-void pb_log(const char *fmt, ...);
-void pb_log_set_stream(FILE *stream);
-
-#endif /* _LOG_H */
--- /dev/null
+++ b/lib/log.c
@@ -0,0 +1,23 @@ 
+
+#include <stdarg.h>
+
+#include "log.h"
+
+static FILE *logf;
+
+void pb_log(const char *fmt, ...)
+{
+	va_list ap;
+	FILE *stream;
+
+	stream = logf ? logf : stdout;
+
+	va_start(ap, fmt);
+	vfprintf(stream, fmt, ap);
+	va_end(ap);
+}
+
+void pb_log_set_stream(FILE *stream)
+{
+	logf = stream;
+}
--- /dev/null
+++ b/lib/log.h
@@ -0,0 +1,9 @@ 
+#ifndef _LOG_H
+#define _LOG_H
+
+#include <stdio.h>
+
+void pb_log(const char *fmt, ...);
+void pb_log_set_stream(FILE *stream);
+
+#endif /* _LOG_H */
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,5 @@ 
 
+
 VPATH = $(srcdir)
 
 CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
@@ -13,7 +14,7 @@  uis = ui/test/pb-test
 parsers = kboot
 artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 
-
+log_objs = lib/log.o
 talloc_objs = lib/talloc/talloc.o
 list_objs = lib/list/list.o
 waiter_objs = lib/waiter.o
@@ -36,7 +37,7 @@  ui/twin/pb-twin: $(pb_twin_objs)
 
 # test ui
 pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \
-	$(talloc_objs) $(server_objs) $(list_objs)
+	$(log_objs) $(talloc_objs) $(server_objs) $(list_objs)
 
 ui/test/pb-test: $(pb_test_objs)
 	$(LINK.o) -o $@ $^
@@ -46,9 +47,9 @@  ui/test/pb-test: $(pb_test_objs)
 #	      discover/yaboot-cfg.o \
 #	      $(foreach p,$(parsers),discover/$(p)-parser.o)
 
-pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \
+pb_discover_objs = discover/pb-discover.o discover/udev.o \
 		   discover/discover-server.o discover/device-handler.o \
-		   discover/paths.o $(waiter_objs) \
+		   discover/paths.o $(waiter_objs) $(log_objs) \
 		   $(talloc_objs) $(server_objs) $(parser_objs) $(list_objs)
 
 discover/pb-discover: $(pb_discover_objs)