fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: remove "common.h" header

Browse source 
It only contained a few defines. Move them over to "utils.h".
This commit is contained in:
Thomas Haller 2015-10-09 18:20:59 +02:00
parent 7209356c4f
commit 0c0cdb1c46
7 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile.am
View file

@ -298,7 +298,6 @@ libNetworkManager_la_SOURCES = \
settings/nm-settings.c \
settings/nm-settings.h \
\
settings/plugins/keyfile/common.h \
settings/plugins/keyfile/nm-keyfile-connection.c \
settings/plugins/keyfile/nm-keyfile-connection.h \
settings/plugins/keyfile/plugin.c \

3
src/settings/plugins/keyfile/Makefile.am
View file

@ -27,8 +27,7 @@ libkeyfile_io_la_SOURCES = \
writer.c \
writer.h \
utils.c \
utils.h \
common.h
utils.h
libkeyfile_io_la_LIBADD = $(GLIB_LIBS)

32
src/settings/plugins/keyfile/common.h
View file

@ -1,32 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager system settings service
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* (C) Copyright 2008 - 2013 Red Hat, Inc.
*/
#ifndef __COMMON_H__
#define __COMMON_H__
#include "nm-default.h"
#define KEYFILE_PLUGIN_NAME "keyfile"
#define KEYFILE_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
#define KEYFILE_DIR NMCONFDIR "/system-connections"
#endif /* __COMMON_H__ */

1
src/settings/plugins/keyfile/nm-keyfile-connection.c
View file

@ -32,7 +32,6 @@
#include "nm-keyfile-connection.h"
#include "reader.h"
#include "writer.h"
#include "common.h"
#include "utils.h"
#include "nm-logging.h"

1
src/settings/plugins/keyfile/plugin.c
View file

@ -41,7 +41,6 @@
#include "nm-settings-plugin.h"
#include "nm-keyfile-connection.h"
#include "writer.h"
#include "common.h"
#include "utils.h"
static void settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface);

5
src/settings/plugins/keyfile/utils.h
View file

@ -24,6 +24,11 @@
#include "nm-default.h"
#include "NetworkManagerUtils.h"
#define KEYFILE_PLUGIN_NAME "keyfile"
#define KEYFILE_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
#define KEYFILE_DIR NMCONFDIR "/system-connections"
#define NM_KEYFILE_CONNECTION_LOG_PATH(path) str_if_set (path,"in-memory")
#define NM_KEYFILE_CONNECTION_LOG_FMT "%s (%s,\"%s\")"
#define NM_KEYFILE_CONNECTION_LOG_ARG(con) NM_KEYFILE_CONNECTION_LOG_PATH (nm_settings_connection_get_filename ((NMSettingsConnection *) (con))), nm_connection_get_uuid ((NMConnection *) (con)), nm_connection_get_id ((NMConnection *) (con))

1
src/settings/plugins/keyfile/writer.c
View file

@ -29,7 +29,6 @@
#include "nm-default.h"
#include "writer.h"
#include "common.h"
#include "utils.h"
#include "nm-keyfile-internal.h"