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

---
 include/olm/logging.h  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 include/olm/logging.hh | 38 --------------------------------------
 include/olm/olm.hh     |  6 +++---
 3 files changed, 47 insertions(+), 41 deletions(-)
 create mode 100644 include/olm/logging.h
 delete mode 100644 include/olm/logging.hh

(limited to 'include/olm')

diff --git a/include/olm/logging.h b/include/olm/logging.h
new file mode 100644
index 0000000..c713992
--- /dev/null
+++ b/include/olm/logging.h
@@ -0,0 +1,44 @@
+/* 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.
+ */
+
+#ifndef OLM_LOGGING_H_
+#define OLM_LOGGING_H_
+
+#include "olm/olm.hh"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define OLM_LOG_FATAL   1
+#define OLM_LOG_ERROR   2
+#define OLM_LOG_WARNING 3
+#define OLM_LOG_INFO    4
+#define OLM_LOG_DEBUG   5
+#define OLM_LOG_TRACE   6
+
+/* returns non-zero if logging is enabled for this level */
+int olm_log_enabled_for(unsigned int level, const char *category);
+
+__attribute__((__format__ (__printf__, 3, 4)))
+void olm_logf(unsigned int level, const char *category,
+          const char *format, ...);
+
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif /* OLM_LOGGING_H_ */
diff --git a/include/olm/logging.hh b/include/olm/logging.hh
deleted file mode 100644
index ff84615..0000000
--- a/include/olm/logging.hh
+++ /dev/null
@@ -1,38 +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.
- */
-
-#ifndef OLM_LOGGING_HH_
-#define OLM_LOGGING_HH_
-
-namespace olm {
-
-const unsigned int LOG_FATAL   = 1;
-const unsigned int LOG_ERROR   = 2;
-const unsigned int LOG_WARNING = 3;
-const unsigned int LOG_INFO    = 4;
-const unsigned int LOG_DEBUG   = 5;
-const unsigned int LOG_TRACE   = 6;
-
-void set_log_level(unsigned int log_level);
-
-bool log_enabled_for(unsigned int level, const char *category);
-
-__attribute__((__format__ (__printf__, 3, 4)))
-void logf(unsigned int level, const char *category,
-          const char *format, ...);
-
-} // namespace olm
-
-#endif /* OLM_LOGGING_HH_ */
diff --git a/include/olm/olm.hh b/include/olm/olm.hh
index ceb8be9..ffecb10 100644
--- a/include/olm/olm.hh
+++ b/include/olm/olm.hh
@@ -25,9 +25,9 @@ extern "C" {
 static const size_t OLM_MESSAGE_TYPE_PRE_KEY = 0;
 static const size_t OLM_MESSAGE_TYPE_MESSAGE = 1;
 
-struct OlmAccount;
-struct OlmSession;
-struct OlmUtility;
+typedef struct OlmAccount OlmAccount;
+typedef struct OlmSession OlmSession;
+typedef struct OlmUtility OlmUtility;
 
 /** The size of an account object in bytes */
 size_t olm_account_size();
-- 
cgit v1.2.3