From patchwork Fri Nov 11 11:12:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 5076 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DD80C23EF5 for ; Fri, 11 Nov 2011 11:12:15 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id CCFD0A1802D for ; Fri, 11 Nov 2011 11:12:15 +0000 (UTC) Received: by faan26 with SMTP id n26so5555625faa.11 for ; Fri, 11 Nov 2011 03:12:15 -0800 (PST) Received: by 10.152.110.228 with SMTP id id4mr850738lab.19.1321009935576; Fri, 11 Nov 2011 03:12:15 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.40.7 with SMTP id t7cs43788lak; Fri, 11 Nov 2011 03:12:15 -0800 (PST) Received: by 10.180.19.9 with SMTP id a9mr13402740wie.32.1321009933395; Fri, 11 Nov 2011 03:12:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id y29si6262685weq.143.2011.11.11.03.12.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Nov 2011 03:12:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1ROp1o-0006YF-T1 for ; Fri, 11 Nov 2011 11:12:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D04D4E032C for ; Fri, 11 Nov 2011 11:12:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 165 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 165: Log: Skip the log continuation character when displaying info messages in normal mode. Message-Id: <20111111111212.23901.14411.launchpad@ackee.canonical.com> Date: Fri, 11 Nov 2011 11:12:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14277"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 42285bad19aee39b43f175a8c6c15d2ef7e220d3 ------------------------------------------------------------ revno: 165 committer: Alexandros Frantzis branch nick: trunk timestamp: Fri 2011-11-11 12:36:48 +0200 message: Log: Skip the log continuation character when displaying info messages in normal mode. modified: src/log.cpp --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'src/log.cpp' --- src/log.cpp 2011-11-10 10:33:26 +0000 +++ src/log.cpp 2011-11-11 10:36:48 +0000 @@ -92,6 +92,20 @@ delete[] buf; } +static void +print_plain_message(FILE *stream, const char *fmt, va_list ap) +{ + va_list aq; + const char *msg = fmt; + + if (msg[0] == LOG_CONTINUE[0]) + msg++; + + va_copy(aq, ap); + vfprintf(stream, msg, ap); + va_end(aq); +} + void Log::info(const char *fmt, ...) { @@ -100,7 +114,7 @@ if (Options::show_debug) print_prefixed_message(stdout, terminal_color_cyan, "Info", fmt, ap); else - vfprintf(stdout, fmt, ap); + print_plain_message(stdout, fmt, ap); va_end(ap); }