mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 03:04:18 +00:00
libnm: merge nm-keyfile-reader.h and nm-keyfile-writer.h to internal header
These headers are not entirely private to libnm-core as they are also used by keyfile plugin. Merge them to a new header file nm-keyfile-internal.h so that the name makes the internal nature of the header more apparent.
This commit is contained in:
Thomas Haller
parent
04df4edf48
commit
5e5afcffce
|
|
@ -48,9 +48,8 @@ libnm_core_private_headers = \
|
|||
$(core)/crypto.h \
|
||||
$(core)/nm-connection-private.h \
|
||||
$(core)/nm-core-internal.h \
|
||||
$(core)/nm-keyfile-reader.h \
|
||||
$(core)/nm-keyfile-internal.h \
|
||||
$(core)/nm-keyfile-utils.h \
|
||||
$(core)/nm-keyfile-writer.h \
|
||||
$(core)/nm-property-compare.h \
|
||||
$(core)/nm-setting-private.h \
|
||||
$(core)/nm-utils-private.h
|
||||
|
|
|
|||
|
|
@ -16,19 +16,78 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2008 Novell, Inc.
|
||||
* Copyright (C) 2008 - 2011 Red Hat, Inc.
|
||||
* Copyright (C) 2015 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __NM_KEYFILE_WRITER_H__
|
||||
#define __NM_KEYFILE_WRITER_H__
|
||||
#ifndef __NM_KEYFILE_INTERNAL_H__
|
||||
#define __NM_KEYFILE_INTERNAL_H__
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <glib.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "nm-connection.h"
|
||||
#include "nm-setting-8021x.h"
|
||||
|
||||
|
||||
/*********************************************************/
|
||||
|
||||
typedef enum {
|
||||
NM_KEYFILE_READ_TYPE_WARN = 1,
|
||||
} NMKeyfileReadType;
|
||||
|
||||
/**
|
||||
* NMKeyfileReadHandler:
|
||||
*
|
||||
* Hook to nm_keyfile_read(). The user might fail the reading by setting
|
||||
* @error.
|
||||
*
|
||||
* Returns: should return TRUE, if the reading was handled. Otherwise,
|
||||
* a default action will be performed that depends on the @type.
|
||||
* For %NM_KEYFILE_READ_TYPE_WARN type, the default action is doing nothing.
|
||||
*/
|
||||
typedef gboolean (*NMKeyfileReadHandler) (GKeyFile *keyfile,
|
||||
NMConnection *connection,
|
||||
NMKeyfileReadType type,
|
||||
void *type_data,
|
||||
void *user_data,
|
||||
GError **error);
|
||||
|
||||
typedef enum {
|
||||
NM_KEYFILE_WARN_SEVERITY_DEBUG = 1000,
|
||||
NM_KEYFILE_WARN_SEVERITY_INFO = 2000,
|
||||
NM_KEYFILE_WARN_SEVERITY_WARN = 3000,
|
||||
} NMKeyfileWarnSeverity;
|
||||
|
||||
/**
|
||||
* NMKeyfileReadTypeDataWarn:
|
||||
*
|
||||
* this struct is passed as @type_data for the @NMKeyfileReadHandler of
|
||||
* type %NM_KEYFILE_READ_TYPE_WARN.
|
||||
*/
|
||||
typedef struct {
|
||||
/* might be %NULL, if the warning is not about a group. */
|
||||
const char *group;
|
||||
|
||||
/* might be %NULL, if the warning is not about a setting. */
|
||||
NMSetting *setting;
|
||||
|
||||
/* might be %NULL, if the warning is not about a property. */
|
||||
const char *property_name;
|
||||
|
||||
NMKeyfileWarnSeverity severity;
|
||||
const char *message;
|
||||
} NMKeyfileReadTypeDataWarn;
|
||||
|
||||
|
||||
NMConnection *nm_keyfile_read (GKeyFile *keyfile,
|
||||
const char *keyfile_name,
|
||||
const char *base_dir,
|
||||
NMKeyfileReadHandler handler,
|
||||
void *user_data,
|
||||
GError **error);
|
||||
|
||||
/*********************************************************/
|
||||
|
||||
typedef enum {
|
||||
NM_KEYFILE_WRITE_TYPE_CERT = 1,
|
||||
} NMKeyfileWriteType;
|
||||
|
|
@ -88,4 +147,4 @@ GKeyFile *nm_keyfile_write (NMConnection *connection,
|
|||
void *user_data,
|
||||
GError **error);
|
||||
|
||||
#endif /* __NM_KEYFILE_WRITER_H__ */
|
||||
#endif /* __NM_KEYFILE_INTERNAL_H__ */
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#include "nm-core-internal.h"
|
||||
#include "gsystem-local-alloc.h"
|
||||
#include "nm-glib-compat.h"
|
||||
#include "nm-keyfile-reader.h"
|
||||
#include "nm-keyfile-internal.h"
|
||||
#include "nm-keyfile-utils.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager system settings service - keyfile plugin
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Copyright (C) 2008 Novell, Inc.
|
||||
* Copyright (C) 2015 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __NM_KEYFILE_READER_H__
|
||||
#define __NM_KEYFILE_READER_H__
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "nm-connection.h"
|
||||
|
||||
|
||||
typedef enum {
|
||||
NM_KEYFILE_READ_TYPE_WARN = 1,
|
||||
} NMKeyfileReadType;
|
||||
|
||||
/**
|
||||
* NMKeyfileReadHandler:
|
||||
*
|
||||
* Hook to nm_keyfile_read(). The user might fail the reading by setting
|
||||
* @error.
|
||||
*
|
||||
* Returns: should return TRUE, if the reading was handled. Otherwise,
|
||||
* a default action will be performed that depends on the @type.
|
||||
* For %NM_KEYFILE_READ_TYPE_WARN type, the default action is doing nothing.
|
||||
*/
|
||||
typedef gboolean (*NMKeyfileReadHandler) (GKeyFile *keyfile,
|
||||
NMConnection *connection,
|
||||
NMKeyfileReadType type,
|
||||
void *type_data,
|
||||
void *user_data,
|
||||
GError **error);
|
||||
|
||||
typedef enum {
|
||||
NM_KEYFILE_WARN_SEVERITY_DEBUG = 1000,
|
||||
NM_KEYFILE_WARN_SEVERITY_INFO = 2000,
|
||||
NM_KEYFILE_WARN_SEVERITY_WARN = 3000,
|
||||
} NMKeyfileWarnSeverity;
|
||||
|
||||
/**
|
||||
* NMKeyfileReadTypeDataWarn:
|
||||
*
|
||||
* this struct is passed as @type_data for the @NMKeyfileReadHandler of
|
||||
* type %NM_KEYFILE_READ_TYPE_WARN.
|
||||
*/
|
||||
typedef struct {
|
||||
/* might be %NULL, if the warning is not about a group. */
|
||||
const char *group;
|
||||
|
||||
/* might be %NULL, if the warning is not about a setting. */
|
||||
NMSetting *setting;
|
||||
|
||||
/* might be %NULL, if the warning is not about a property. */
|
||||
const char *property_name;
|
||||
|
||||
NMKeyfileWarnSeverity severity;
|
||||
const char *message;
|
||||
} NMKeyfileReadTypeDataWarn;
|
||||
|
||||
|
||||
NMConnection *nm_keyfile_read (GKeyFile *keyfile,
|
||||
const char *keyfile_name,
|
||||
const char *base_dir,
|
||||
NMKeyfileReadHandler handler,
|
||||
void *user_data,
|
||||
GError **error);
|
||||
|
||||
#endif /* __NM_KEYFILE_READER_H__ */
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
#include "nm-utils.h"
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
#include "nm-keyfile-writer.h"
|
||||
#include "nm-keyfile-internal.h"
|
||||
#include "nm-keyfile-utils.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
|
|||
Loading…
Reference in a new issue