summaryrefslogtreecommitdiff
path: root/src/util/virlog.c
diff options
context:
space:
mode:
authorTim Wiederhake <twiederh@redhat.com>2020-09-11 13:42:04 +0200
committerJán Tomko <jtomko@redhat.com>2020-09-11 18:19:58 +0200
commit51b97132b16e4589bebe92baa8109e7c38f9eaf8 (patch)
treeda4e4913fc5d3962dcf8b6d094aa28883302bb77 /src/util/virlog.c
parent38f7fdfdb49f324d5d072dfd71e0cef7ad26851e (diff)
downloadlibvirt-51b97132b16e4589bebe92baa8109e7c38f9eaf8.tar.gz
util: Use glib memory functions in virLogFilterNew
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
Diffstat (limited to 'src/util/virlog.c')
-rw-r--r--src/util/virlog.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/util/virlog.c b/src/util/virlog.c
index f6d0c6c050..285c130d36 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1308,7 +1308,6 @@ virLogFilterNew(const char *match,
virLogPriority priority)
{
virLogFilterPtr ret = NULL;
- char *mdup = NULL;
size_t mlen = strlen(match);
if (priority < VIR_LOG_DEBUG || priority > VIR_LOG_ERROR) {
@@ -1317,23 +1316,16 @@ virLogFilterNew(const char *match,
return NULL;
}
+ ret = g_new0(virLogFilter, 1);
+ ret->priority = priority;
+
/* We must treat 'foo' as equiv to '*foo*' for g_pattern_match
* todo substring matches, so add 2 extra bytes
*/
- if (VIR_ALLOC_N_QUIET(mdup, mlen + 3) < 0)
- return NULL;
-
- mdup[0] = '*';
- memcpy(mdup + 1, match, mlen);
- mdup[mlen + 1] = '*';
-
- if (VIR_ALLOC_QUIET(ret) < 0) {
- VIR_FREE(mdup);
- return NULL;
- }
-
- ret->match = mdup;
- ret->priority = priority;
+ ret->match = g_new0(char, mlen + 3);
+ ret->match[0] = '*';
+ memcpy(ret->match + 1, match, mlen);
+ ret->match[mlen + 1] = '*';
return ret;
}