From 48cb5f925d3bf21c51818dbe46c864a6975ccc75 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 16 May 2016 11:04:26 +0100
Subject: Add olm::log_enabled_for

---
 src/logging.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/logging.cpp')

diff --git a/src/logging.cpp b/src/logging.cpp
index 66b9fa8..4819e1c 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -26,6 +26,11 @@ void set_log_level(unsigned int level) {
     log_level = level;
 }
 
+bool log_enabled_for(unsigned int level, const char *category)
+{
+    return level <= log_level;
+}
+
 void logf(unsigned int level, const char *category,
           const char *format, ...) {
     if (level > log_level) {
-- 
cgit v1.2.3


From b3db0e6ee14315d20ca91eff91e348e18dd119e6 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 13 May 2016 11:53:33 +0100
Subject: translate logging.cpp to C

---
 src/logging.cpp | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 src/logging.cpp

(limited to 'src/logging.cpp')

diff --git a/src/logging.cpp b/src/logging.cpp
deleted file mode 100644
index 4819e1c..0000000
--- a/src/logging.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2016 OpenMarket Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "olm/logging.hh"
-
-#include <cstdarg>
-#include <cstdio>
-
-namespace olm {
-
-static unsigned int log_level = 1;
-
-void set_log_level(unsigned int level) {
-    log_level = level;
-}
-
-bool log_enabled_for(unsigned int level, const char *category)
-{
-    return level <= log_level;
-}
-
-void logf(unsigned int level, const char *category,
-          const char *format, ...) {
-    if (level > log_level) {
-        return;
-    }
-
-    fputs(category, stdout);
-    fputs(": ", stdout);
-
-    va_list ap;
-    va_start(ap, format);
-    vprintf(format, ap);
-    va_end(ap);
-
-    putchar('\n');
-}
-
-} // namespace olm
-- 
cgit v1.2.3