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

config: fix documentation of --log-domains

Browse Source 
The list of log domains in the --log-domains documentation had gotten
out of date. Fix this by adding nm_logging_all_domain_to_string()
(and, for completeness, nm_logging_all_levels_to_string()), and use
those to fill in the help string.
This commit is contained in:
Dan Winship
2013-03-11 12:23:57 -04:00
parent 3407726758
commit 8bb9ee8d3b
3 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/logging/nm-logging.c
View File

@@ -209,6 +209,25 @@ nm_logging_level_to_string (void)
return "";
}
const char *
nm_logging_all_levels_to_string (void)
{
static GString *str;
if (G_UNLIKELY (!str)) {
const LogDesc *diter;
str = g_string_new (NULL);
for (diter = &level_descs[0]; diter->name; diter++) {
if (str->len)
g_string_append_c (str, ',');
g_string_append (str, diter->name);
}
}
return str->str;
}
char *
nm_logging_domains_to_string (void)
{
@@ -226,6 +245,29 @@ nm_logging_domains_to_string (void)
return g_string_free (str, FALSE);
}
const char *
nm_logging_all_domains_to_string (void)
{
static GString *str;
if (G_UNLIKELY (!str)) {
const LogDesc *diter;
str = g_string_new ("DEFAULT");
for (diter = &domain_descs[0]; diter->name; diter++) {
g_string_append_c (str, ',');
g_string_append (str, diter->name);
if (diter->num == LOGD_DHCP6)
g_string_append (str, ",DHCP");
else if (diter->num == LOGD_IP6)
g_string_append (str, ",IP");
}
g_string_append (str, ",ALL");
}
return str->str;
}
gboolean
nm_logging_level_enabled (guint32 level)
{