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

keyfile: merge NMKeyfile{Read,Write}Type as NMKeyfileHandlerType

Browse source 
This will become public API. The enum for read and write callback
serves very similar purposes. Merge them so that we have fewer
types in the public API.
This commit is contained in:
Thomas Haller 2020-05-23 17:28:33 +02:00
parent ccac506a8a
commit 18c1fe6ed8
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
shared/nm-keyfile/nm-keyfile-internal.h
View file

@ -32,8 +32,9 @@ char *nm_keyfile_detect_unqualified_path_scheme (const char *base_dir,
gboolean *out_exists);
typedef enum {
NM_KEYFILE_READ_TYPE_WARN = 1,
} NMKeyfileReadType;
NM_KEYFILE_HANDLER_TYPE_WARN = 1,
NM_KEYFILE_HANDLER_TYPE_WRITE_CERT = 2,
} NMKeyfileHandlerType;
/**
* NMKeyfileReadHandler:
@ -43,11 +44,11 @@ typedef enum {
*
* 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.
* For %NM_KEYFILE_HANDLER_TYPE_WARN type, the default action is doing nothing.
*/
typedef gboolean (*NMKeyfileReadHandler) (GKeyFile *keyfile,
NMConnection *connection,
NMKeyfileReadType type,
NMKeyfileHandlerType type,
void *type_data,
void *user_data,
GError **error);
@ -63,7 +64,7 @@ typedef enum {
* NMKeyfileReadTypeDataWarn:
*
* this struct is passed as @type_data for the @NMKeyfileReadHandler of
* type %NM_KEYFILE_READ_TYPE_WARN.
* type %NM_KEYFILE_HANDLER_TYPE_WARN.
*/
typedef struct {
/* might be %NULL, if the warning is not about a group. */
@ -93,10 +94,6 @@ gboolean nm_keyfile_read_ensure_uuid (NMConnection *connection,
/*****************************************************************************/
typedef enum {
NM_KEYFILE_WRITE_TYPE_CERT = 1,
} NMKeyfileWriteType;
/**
* NMKeyfileWriteHandler:
*
@ -106,7 +103,7 @@ typedef enum {
* within the keyfile or that might be serialized differently. The @type and
* @type_data arguments tell which kind of argument we have at hand.
*
* Currently only the type %NM_KEYFILE_WRITE_TYPE_CERT is supported, which provides
* Currently only the type %NM_KEYFILE_HANDLER_TYPE_WRITE_CERT is supported, which provides
* @type_data as %NMKeyfileWriteTypeDataCert. However, this handler should be generic enough
* to support other types as well.
*
@ -122,7 +119,7 @@ typedef enum {
*/
typedef gboolean (*NMKeyfileWriteHandler) (NMConnection *connection,
GKeyFile *keyfile,
NMKeyfileWriteType type,
NMKeyfileHandlerType type,
void *type_data,
void *user_data,
GError **error);
@ -131,7 +128,7 @@ typedef gboolean (*NMKeyfileWriteHandler) (NMConnection *connection,
* NMKeyfileWriteTypeDataCert:
*
* this struct is passed as @type_data for the @NMKeyfileWriteHandler of
* type %NM_KEYFILE_WRITE_TYPE_CERT.
* type %NM_KEYFILE_HANDLER_TYPE_WRITE_CERT.
*/
typedef struct {
const NMSetting8021xSchemeVtable *vtable;

4
shared/nm-keyfile/nm-keyfile.c
View file

@ -65,7 +65,7 @@ _handle_warn (KeyfileReaderInfo *info,
info->handler (info->keyfile,
info->connection,
NM_KEYFILE_READ_TYPE_WARN,
NM_KEYFILE_HANDLER_TYPE_WARN,
&type_data,
info->user_data,
&info->error);
@ -2434,7 +2434,7 @@ cert_writer (KeyfileWriterInfo *info,
if (info->handler) {
if (info->handler (info->connection,
info->keyfile,
NM_KEYFILE_WRITE_TYPE_CERT,
NM_KEYFILE_HANDLER_TYPE_WRITE_CERT,
&type_data,
info->user_data,
&info->error))

4
src/settings/plugins/keyfile/nms-keyfile-reader.c
View file

@ -48,14 +48,14 @@ typedef struct {
static gboolean
_handler_read (GKeyFile *keyfile,
NMConnection *connection,
NMKeyfileReadType type,
NMKeyfileHandlerType type,
void *type_data,
void *user_data,
GError **error)
{
const HandlerReadData *handler_data = user_data;
if (type == NM_KEYFILE_READ_TYPE_WARN) {
if (type == NM_KEYFILE_HANDLER_TYPE_WARN) {
NMKeyfileReadTypeDataWarn *warn_data = type_data;
NMLogLevel level;
char *message_free = NULL;

4
src/settings/plugins/keyfile/nms-keyfile-writer.c
View file

@ -146,12 +146,12 @@ cert_writer (NMConnection *connection,
static gboolean
_handler_write (NMConnection *connection,
GKeyFile *keyfile,
NMKeyfileWriteType type,
NMKeyfileHandlerType type,
void *type_data,
void *user_data,
GError **error)
{
if (type == NM_KEYFILE_WRITE_TYPE_CERT) {
if (type == NM_KEYFILE_HANDLER_TYPE_WRITE_CERT) {
cert_writer (connection, keyfile,
(NMKeyfileWriteTypeDataCert *) type_data,
(WriteInfo *) user_data, error);