]> xenbits.xensource.com Git - osstest/qemu.git/commitdiff
Revert "guest agent: remove g_strcmp0 usage"
authorMarkus Armbruster <armbru@redhat.com>
Wed, 27 May 2015 17:53:49 +0000 (19:53 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 8 Jul 2015 01:13:13 +0000 (20:13 -0500)
Since we now require GLib 2.22+ (commit f40685c), we don't have to
work around lack of g_strcmp0() anymore.

This reverts commit 8f4774789947bc4bc4c8d026a289fe980d3d2ee1.

Conflicts:
qemu-ga.c

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
qga/main.c

index 23cde0104ab9a8e047e7e6454765cdd92cec31e1..791982ef01cfa603b81bb75538c5f7e430fb204c 100644 (file)
@@ -274,7 +274,7 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
 
     level &= G_LOG_LEVEL_MASK;
 #ifndef _WIN32
-    if (domain && strcmp(domain, "syslog") == 0) {
+    if (g_strcmp0(domain, "syslog") == 0) {
         syslog(LOG_INFO, "%s: %s", level_str, msg);
     } else if (level & s->log_level) {
 #else