[network-manager-libreswan/th/vpn-plugin-debug-bgo766872: 13/20] shared: add shared file "shared/nm-vpn/nm-vpn-plugin-macros.h"
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-libreswan/th/vpn-plugin-debug-bgo766872: 13/20] shared: add shared file "shared/nm-vpn/nm-vpn-plugin-macros.h"
- Date: Tue, 14 Jun 2016 13:12:10 +0000 (UTC)
commit 011232f966d0ae99b42115bcc090c10243fbe46b
Author: Thomas Haller <thaller redhat com>
Date: Thu May 26 13:07:42 2016 +0200
shared: add shared file "shared/nm-vpn/nm-vpn-plugin-macros.h"
We already have "shared/nm-vpn/nm-vpn-plugin-utils.h". Contrary to that
file, "nm-vpn-plugin-macros.h" is header-only.
shared/Makefile.am | 3 +-
shared/README | 1 +
shared/nm-vpn/nm-vpn-plugin-macros.h | 43 ++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/shared/Makefile.am b/shared/Makefile.am
index e04aeb6..c718518 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -49,7 +49,8 @@ libnm_vpn_editor_utils_shared_la_CPPFLAGS = \
libnm_vpn_editor_utils_shared_la_SOURCES = \
nm-vpn/nm-vpn-plugin-utils.c \
- nm-vpn/nm-vpn-plugin-utils.h
+ nm-vpn/nm-vpn-plugin-utils.h \
+ nm-vpn/nm-vpn-plugin-macros.h
libnm_vpn_editor_utils_shared_la_LIBADD = \
$(LIBNM_LIBS) \
diff --git a/shared/README b/shared/README
index 7e72767..960117d 100644
--- a/shared/README
+++ b/shared/README
@@ -13,6 +13,7 @@ are copied as-is from NetworkManager
2) the files
shared/nm-vpn/nm-vpn-plugin-utils.c
shared/nm-vpn/nm-vpn-plugin-utils.h
+ shared/nm-vpn/nm-vpn-plugin-macros.h
are copied as-is from nm-openvpn
https://git.gnome.org/browse/network-manager-openvpn/tree/shared?id=3d0ac3ca94b4bf24f77306cef5a95172ddaf5fc4
diff --git a/shared/nm-vpn/nm-vpn-plugin-macros.h b/shared/nm-vpn/nm-vpn-plugin-macros.h
new file mode 100644
index 0000000..d685934
--- /dev/null
+++ b/shared/nm-vpn/nm-vpn-plugin-macros.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2016 Red Hat, Inc.
+ */
+
+#ifndef __NM_VPN_PLUGIN_MACROS_H__
+#define __NM_VPN_PLUGIN_MACROS_H__
+
+#include <syslog.h>
+
+static inline const char *
+nm_utils_syslog_to_str (int syslog_level)
+{
+ /* Maps the levels the same way as NetworkManager's nm-logging.c does */
+ if (syslog_level >= LOG_DEBUG)
+ return "<trace>";
+ if (syslog_level >= LOG_INFO)
+ return "<debug>";
+ if (syslog_level >= LOG_NOTICE)
+ return "<info>";
+ if (syslog_level >= LOG_WARNING)
+ return "<warn>";
+ return "<error>";
+}
+
+#endif /* __NM_VPN_PLUGIN_MACROS_H__ */
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]