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

ifcfg-rh: use _NMLOG() macro in writer

Browse source 
This gives every logging line a proper "ifcfg-rh" prefix.
But drop the "    " prefixes.
This commit is contained in:
Thomas Haller 2016-05-16 16:19:22 +02:00
parent a519cc57b8
commit f3bd778d6d
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/settings/plugins/ifcfg-rh/writer.c
View file

@ -53,6 +53,19 @@
#include "utils.h"
#include "crypto.h"
/*****************************************************************************/
#define _NMLOG_DOMAIN LOGD_SETTINGS
#define _NMLOG_PREFIX_NAME "ifcfg-rh"
#define _NMLOG(level, ...) \
G_STMT_START { \
nm_log ((level), (_NMLOG_DOMAIN), \
"%s" _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
_NMLOG_PREFIX_NAME": " \
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} G_STMT_END
/*****************************************************************************/
static void
save_secret_flags (shvarFile *ifcfg,
@ -100,7 +113,7 @@ set_secret (shvarFile *ifcfg,
{
shvarFile *keyfile;
GError *error = NULL;
/* Clear the secret from the ifcfg and the associated "keys" file */
svSetValue (ifcfg, key, NULL, FALSE);
@ -109,7 +122,7 @@ set_secret (shvarFile *ifcfg,
keyfile = utils_get_keys_ifcfg (ifcfg->fileName, TRUE);
if (!keyfile) {
nm_log_warn (LOGD_SETTINGS, " could not create ifcfg file for '%s'", ifcfg->fileName);
_LOGW ("could not create ifcfg file for '%s'", ifcfg->fileName);
goto error;
}
@ -121,8 +134,8 @@ set_secret (shvarFile *ifcfg,
svSetValue (keyfile, key, value, verbatim);
if (!svWriteFile (keyfile, 0600, &error)) {
nm_log_warn (LOGD_SETTINGS, " could not update ifcfg file '%s': %s",
keyfile->fileName, error->message);
_LOGW ("could not update ifcfg file '%s': %s",
keyfile->fileName, error->message);
g_clear_error (&error);
svCloseFile (keyfile);
goto error;
@ -715,7 +728,7 @@ write_wireless_security_setting (NMConnection *connection,
key = ascii_key;
}
} else {
nm_log_warn (LOGD_SETTINGS, " invalid WEP key '%s'", key);
_LOGW ("invalid WEP key '%s'", key);
tmp = NULL;
}