From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCKgt-0001FR-IJ for qemu-devel@nongnu.org; Tue, 07 Jul 2015 00:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCKgs-0006NP-24 for qemu-devel@nongnu.org; Tue, 07 Jul 2015 00:41:07 -0400 Received: from mail-ob0-x22c.google.com ([2607:f8b0:4003:c01::22c]:34137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCKgr-0006NF-UQ for qemu-devel@nongnu.org; Tue, 07 Jul 2015 00:41:06 -0400 Received: by obbkm3 with SMTP id km3so121034677obb.1 for ; Mon, 06 Jul 2015 21:41:05 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Mon, 6 Jul 2015 23:40:13 -0500 Message-Id: <1436244020-27822-4-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1436244020-27822-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1436244020-27822-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 03/10] Revert "guest agent: remove g_strcmp0 usage" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Markus Armbruster From: Markus Armbruster 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 Reviewed-by: John Snow Signed-off-by: Michael Roth --- qga/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/main.c b/qga/main.c index 23cde01..791982e 100644 --- a/qga/main.c +++ b/qga/main.c @@ -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 -- 1.9.1