From 02d5c36cc001f0b377a132dfc859022eb68106fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Tue, 19 Feb 2019 13:28:34 +0100
Subject: [PATCH] lwext4: remove depcreated APIs

Fixes #140.
---
 src/lib/lwext4/block.cc |  1 -
 src/lib/lwext4/libc.cc  | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lib/lwext4/block.cc b/src/lib/lwext4/block.cc
index a4af16e..f76a124 100644
--- a/src/lib/lwext4/block.cc
+++ b/src/lib/lwext4/block.cc
@@ -15,7 +15,6 @@
 #include <base/allocator.h>
 #include <base/allocator_avl.h>
 #include <base/log.h>
-#include <base/printf.h>
 #include <block_session/connection.h>
 #include <util/string.h>
 
diff --git a/src/lib/lwext4/libc.cc b/src/lib/lwext4/libc.cc
index c92647b..c0fa379 100644
--- a/src/lib/lwext4/libc.cc
+++ b/src/lib/lwext4/libc.cc
@@ -14,7 +14,8 @@
 /* Genode includes */
 #include <base/allocator.h>
 #include <base/log.h>
-#include <base/printf.h>
+#include <base/snprintf.h>
+#include <log_session/log_session.h>
 #include <util/string.h>
 
 /* library includes */
@@ -57,18 +58,27 @@ int fflush(FILE *)
 
 int printf(char const *fmt, ...)
 {
+	static char buffer[Genode::Log_session::MAX_STRING_LEN];
+
 	va_list list;
 	va_start(list, fmt);
-	Genode::vprintf(fmt, list);
+	Genode::String_console sc(buffer, sizeof (buffer));
+	sc.vprintf(fmt, list);
 	va_end(list);
 
+	/* remove newline as Genode::log() will implicitly add one */
+	size_t n = sc.len();
+	if (n > 0 && buffer[n-1] == '\n') { n--; }
+
+	Genode::log(Genode::Cstring(buffer, n));
+
 	return 0;
 }
 
 
 int puts(const char *s)
 {
-	Genode::printf(s);
+	printf("%s\n", s);
 	return 0;
 }