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

ifcfg-rh: add svGetValueFull() function

Browse source
This commit is contained in:
Thomas Haller 2015-05-20 13:41:31 +02:00
parent 32871deecc
commit 33aaa730c5
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -256,6 +256,22 @@ svEscape (const char *s, char **to_free)
*/ */
char * char *
svGetValue (shvarFile *s, const char *key, gboolean verbatim) svGetValue (shvarFile *s, const char *key, gboolean verbatim)
{
char *value;
value = svGetValueFull (s, key, verbatim);
if (value && !*value) {
g_free (value);
return NULL;
}
return value;
}
/* svGetValueFull() is identical to svGetValue() except that
* svGetValue() will never return an empty value (but %NULL instead).
* svGetValueFull() will return empty values if that is the value for the @key. */
char *
svGetValueFull (shvarFile *s, const char *key, gboolean verbatim)
{ {
char *value = NULL; char *value = NULL;
char *line; char *line;
@ -280,12 +296,7 @@ svGetValue (shvarFile *s, const char *key, gboolean verbatim)
} }
g_free (keyString); g_free (keyString);
if (value && value[0]) { return value;
return value;
} else {
g_free (value);
return NULL;
}
} }
/* return TRUE if <key> resolves to any truth value (e.g. "yes", "y", "true") /* return TRUE if <key> resolves to any truth value (e.g. "yes", "y", "true")

1
src/settings/plugins/ifcfg-rh/shvar.h
View file

@ -56,6 +56,7 @@ shvarFile *svOpenFile (const char *name, GError **error);
* be freed by the caller. * be freed by the caller.
*/ */
char *svGetValue (shvarFile *s, const char *key, gboolean verbatim); char *svGetValue (shvarFile *s, const char *key, gboolean verbatim);
char *svGetValueFull (shvarFile *s, const char *key, gboolean verbatim);
/* return TRUE if <key> resolves to any truth value (e.g. "yes", "y", "true") /* return TRUE if <key> resolves to any truth value (e.g. "yes", "y", "true")
* return FALSE if <key> resolves to any non-truth value (e.g. "no", "n", "false") * return FALSE if <key> resolves to any non-truth value (e.g. "no", "n", "false")