summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-05-03 11:57:35 +0200
committerThomas Haller <thaller@redhat.com>2019-05-07 16:41:21 +0200
commit8c2fda7ca09e0fb5119e5ba15b242aa6a93fde99 (patch)
treea430fc133c6210b7f9d361742415643bc2450fc5
parent8decdf22258f678897bb0d37ca0872d10bbd1c9e (diff)
downloadNetworkManager-8c2fda7ca09e0fb5119e5ba15b242aa6a93fde99.tar.gz
shared: add "shared/nm-glib-aux/nm-keyfile-aux.h"
-rw-r--r--Makefile.am2
-rw-r--r--libnm-core/nm-keyfile-utils.c2
-rw-r--r--shared/meson.build1
-rw-r--r--shared/nm-glib-aux/nm-keyfile-aux.c24
-rw-r--r--shared/nm-glib-aux/nm-keyfile-aux.h24
5 files changed, 52 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 993ee9781d..1de743030f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -347,6 +347,8 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
shared/nm-glib-aux/nm-io-utils.c \
shared/nm-glib-aux/nm-io-utils.h \
shared/nm-glib-aux/nm-jansson.h \
+ shared/nm-glib-aux/nm-keyfile-aux.c \
+ shared/nm-glib-aux/nm-keyfile-aux.h \
shared/nm-glib-aux/nm-logging-fwd.h \
shared/nm-glib-aux/nm-macros-internal.h \
shared/nm-glib-aux/nm-obj.h \
diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index e243150d02..a7d50e2216 100644
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -415,7 +415,7 @@ _keyfile_key_encode (const char *name,
/* See g_key_file_is_key_name().
*
- * GKeyfile allows all UTF-8 characters (even non-well formed sequences),
+ * GKeyFile allows all UTF-8 characters (even non-well formed sequences),
* except:
* - no empty keys
* - no leading/trailing ' '
diff --git a/shared/meson.build b/shared/meson.build
index ba4c28c3fd..a63068eca5 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -144,6 +144,7 @@ shared_nm_glib_aux = static_library(
'nm-glib-aux/nm-errno.c',
'nm-glib-aux/nm-hash-utils.c',
'nm-glib-aux/nm-io-utils.c',
+ 'nm-glib-aux/nm-keyfile-aux.c',
'nm-glib-aux/nm-random-utils.c',
'nm-glib-aux/nm-secret-utils.c',
'nm-glib-aux/nm-shared-utils.c',
diff --git a/shared/nm-glib-aux/nm-keyfile-aux.c b/shared/nm-glib-aux/nm-keyfile-aux.c
new file mode 100644
index 0000000000..a0d8186d8d
--- /dev/null
+++ b/shared/nm-glib-aux/nm-keyfile-aux.c
@@ -0,0 +1,24 @@
+/* NetworkManager -- Network link manager
+ *
+ * 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.
+ *
+ * (C) Copyright 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-keyfile-aux.h"
+
diff --git a/shared/nm-glib-aux/nm-keyfile-aux.h b/shared/nm-glib-aux/nm-keyfile-aux.h
new file mode 100644
index 0000000000..f7ef866c92
--- /dev/null
+++ b/shared/nm-glib-aux/nm-keyfile-aux.h
@@ -0,0 +1,24 @@
+/* NetworkManager -- Network link manager
+ *
+ * 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.
+ *
+ * (C) Copyright 2019 Red Hat, Inc.
+ */
+
+#ifndef __NM_KEYFILE_AUX_H__
+#define __NM_KEYFILE_AUX_H__
+
+#endif /* __NM_KEYFILE_AUX_H__ */