From patchwork Fri Jan 27 15:01:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 6423 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 4A63F249C5 for ; Fri, 27 Jan 2012 15:01:14 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 38093A18513 for ; Fri, 27 Jan 2012 15:01:14 +0000 (UTC) Received: by bkar19 with SMTP id r19so1917249bka.11 for ; Fri, 27 Jan 2012 07:01:14 -0800 (PST) Received: by 10.205.127.17 with SMTP id gy17mr3178465bkc.110.1327676473855; Fri, 27 Jan 2012 07:01:13 -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.204.130.220 with SMTP id u28cs75537bks; Fri, 27 Jan 2012 07:01:13 -0800 (PST) Received: by 10.180.100.234 with SMTP id fb10mr11545640wib.8.1327676472982; Fri, 27 Jan 2012 07:01:12 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o82si6479011weq.132.2012.01.27.07.01.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jan 2012 07:01:12 -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 1RqnIe-00044h-Od for ; Fri, 27 Jan 2012 15:01:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id A6C66E028B for ; Fri, 27 Jan 2012 15:01:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: libmatrix X-Launchpad-Branch: ~jesse-barker/libmatrix/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 34 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~jesse-barker/libmatrix/trunk] Rev 34: Merge of lp:~linaro-graphics-wg/libmatrix/log-fixes to address issues with Android support. Message-Id: <20120127150112.5300.32962.launchpad@ackee.canonical.com> Date: Fri, 27 Jan 2012 15:01: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="14727"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: f6914116793c9199907374278cd1afa538664eba Merge authors: Alexandros Frantzis (afrantzis) Related merge proposals: https://code.launchpad.net/~linaro-graphics-wg/libmatrix/log-fixes/+merge/90424 proposed by: Alexandros Frantzis (afrantzis) ------------------------------------------------------------ revno: 34 [merge] committer: Jesse Barker branch nick: trunk timestamp: Fri 2012-01-27 06:58:24 -0800 message: Merge of lp:~linaro-graphics-wg/libmatrix/log-fixes to address issues with Android support. modified: log.cc --- lp:libmatrix https://code.launchpad.net/~jesse-barker/libmatrix/trunk You are subscribed to branch lp:libmatrix. To unsubscribe from this branch go to https://code.launchpad.net/~jesse-barker/libmatrix/trunk/+edit-subscription === modified file 'log.cc' --- log.cc 2012-01-26 17:31:27 +0000 +++ log.cc 2012-01-27 11:55:16 +0000 @@ -67,10 +67,7 @@ if (!color.empty()) { start_color = color; - if (color[0] != 0) - { - end_color = terminal_color_normal; - } + end_color = terminal_color_normal; } linePrefix = start_color + prefix + end_color + colon; } @@ -151,12 +148,12 @@ va_start(ap, fmt); __android_log_vprint(ANDROID_LOG_INFO, appname.c_str(), fmt, ap); va_end(ap); -}q +} void Log::debug(const char *fmt, ...) { - if (!Options::show_debug) + if (!do_debug_) return; va_list ap; va_start(ap, fmt);