colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyfile: add write_handle_warn() helper

Browse Source
This commit is contained in:
Thomas Haller
2022-03-23 13:28:15 +01:00
parent cec1269795
commit b07bf1a8bb
1 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/libnm-core-impl/nm-keyfile.c
View File

@@ -115,6 +115,8 @@ _key_file_handler_data_init_write(NMKeyfileHandlerData *handler_data,
&info->error); &info->error);
} }
/*****************************************************************************/
_nm_printf(5, 6) static void _read_handle_warn(KeyfileReaderInfo *info, _nm_printf(5, 6) static void _read_handle_warn(KeyfileReaderInfo *info,
const char *kf_key, const char *kf_key,
const char *cur_property, const char *cur_property,
@@ -166,6 +168,61 @@ _nm_printf(5, 6) static void _read_handle_warn(KeyfileReaderInfo *info,
/*****************************************************************************/ /*****************************************************************************/
_nm_unused _nm_printf(6, 7) static void _write_handle_warn(KeyfileWriterInfo *info,
NMSetting *setting,
const char *kf_key,
const char *cur_property,
NMKeyfileWarnSeverity severity,
const char *fmt,
...)
{
NMKeyfileHandlerData handler_data;
_key_file_handler_data_init_write(&handler_data,
NM_KEYFILE_HANDLER_TYPE_WARN,
info,
nm_setting_get_name(setting),
cur_property,
setting,
kf_key);
handler_data.warn = (NMKeyfileHandlerDataWarn){
.severity = severity,
.message = NULL,
.fmt = fmt,
};
va_start(handler_data.warn.ap, fmt);
info->write_handler(info->connection,
info->keyfile,
NM_KEYFILE_HANDLER_TYPE_WARN,
&handler_data,
info->user_data);
va_end(handler_data.warn.ap);
g_free(handler_data.warn.message);
}
#define write_handle_warn(arg_info, arg_setting, arg_kf_key, arg_property_name, arg_severity, ...) \
({ \
KeyfileWriterInfo *_info = (arg_info); \
\
nm_assert(!_info->error); \
\
if (_info->write_handler) { \
_write_handle_warn(_info, \
(arg_setting), \
(arg_kf_key), \
(arg_property_name), \
(arg_severity), \
__VA_ARGS__); \
} \
_info->error == NULL; \
})
/*****************************************************************************/
static gboolean static gboolean
_secret_flags_persist_secret(NMSettingSecretFlags flags) _secret_flags_persist_secret(NMSettingSecretFlags flags)
{ {