[{"id":18376,"web_url":"https://patchwork.libcamera.org/comment/18376/","msgid":"<20210727093948.lksws6pa4bi42msw@uno.localdomain>","date":"2021-07-27T09:39:48","subject":"Re: [libcamera-devel] [PATCH] cam: options: Restore std::cerr\n\tadjustement field","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Fri, Jul 23, 2021 at 07:23:53AM +0300, Laurent Pinchart wrote:\n> The std::cerr adjustment is set to std::left to print the usage text.\n> Restore it to its original value when done, to avoid affecting the\n> caller.\n\nSeems sane!\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n   j\n\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  src/cam/options.cpp | 9 +++++++--\n>  1 file changed, 7 insertions(+), 2 deletions(-)\n>\n> diff --git a/src/cam/options.cpp b/src/cam/options.cpp\n> index 33bc512e6571..4f7e869144c8 100644\n> --- a/src/cam/options.cpp\n> +++ b/src/cam/options.cpp\n> @@ -453,7 +453,7 @@ void KeyValueParser::usage(int indent)\n>  \t\t\t\targument += \"]\";\n>  \t\t}\n>\n> -\t\tstd::cerr << std::setw(indent) << std::left << argument;\n> +\t\tstd::cerr << std::setw(indent) << argument;\n>\n>  \t\tfor (const char *help = option.help, *end = help; end;) {\n>  \t\t\tend = strchr(help, '\\n');\n> @@ -994,7 +994,12 @@ void OptionsParser::usage()\n>\n>  \tstd::cerr << \"Options:\" << std::endl;\n>\n> +\tstd::ios_base::fmtflags f(std::cerr.flags());\n> +\tstd::cerr << std::left;\n> +\n>  \tusageOptions(options_, indent);\n> +\n> +\tstd::cerr.flags(f);\n>  }\n>\n>  void OptionsParser::usageOptions(const std::list<Option> &options,\n> @@ -1031,7 +1036,7 @@ void OptionsParser::usageOptions(const std::list<Option> &options,\n>  \t\tif (option.isArray)\n>  \t\t\targument += \" ...\";\n>\n> -\t\tstd::cerr << std::setw(indent) << std::left << argument;\n> +\t\tstd::cerr << std::setw(indent) << argument;\n>\n>  \t\tfor (const char *help = option.help, *end = help; end; ) {\n>  \t\t\tend = strchr(help, '\\n');\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8B3F2C0109\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 27 Jul 2021 09:39:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D340D687BF;\n\tTue, 27 Jul 2021 11:39:03 +0200 (CEST)","from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C210E687BA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Jul 2021 11:39:01 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 4FD78C000F;\n\tTue, 27 Jul 2021 09:39:00 +0000 (UTC)"],"Date":"Tue, 27 Jul 2021 11:39:48 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Message-ID":"<20210727093948.lksws6pa4bi42msw@uno.localdomain>","References":"<20210723042353.6616-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210723042353.6616-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] cam: options: Restore std::cerr\n\tadjustement field","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":18378,"web_url":"https://patchwork.libcamera.org/comment/18378/","msgid":"<1fcadff6-e60b-835d-18eb-4a3e068ceef0@ideasonboard.com>","date":"2021-07-27T10:24:12","subject":"Re: [libcamera-devel] [PATCH] cam: options: Restore std::cerr\n\tadjustement field","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"in $SUBJECT s/adjustement/adjustment/\n\nOn 23/07/2021 05:23, Laurent Pinchart wrote:\n> The std::cerr adjustment is set to std::left to print the usage text.\n> Restore it to its original value when done, to avoid affecting the\n> caller.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nLGTM...\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/cam/options.cpp | 9 +++++++--\n>  1 file changed, 7 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/cam/options.cpp b/src/cam/options.cpp\n> index 33bc512e6571..4f7e869144c8 100644\n> --- a/src/cam/options.cpp\n> +++ b/src/cam/options.cpp\n> @@ -453,7 +453,7 @@ void KeyValueParser::usage(int indent)\n>  \t\t\t\targument += \"]\";\n>  \t\t}\n>  \n> -\t\tstd::cerr << std::setw(indent) << std::left << argument;\n> +\t\tstd::cerr << std::setw(indent) << argument;\n>  \n>  \t\tfor (const char *help = option.help, *end = help; end;) {\n>  \t\t\tend = strchr(help, '\\n');\n> @@ -994,7 +994,12 @@ void OptionsParser::usage()\n>  \n>  \tstd::cerr << \"Options:\" << std::endl;\n>  \n> +\tstd::ios_base::fmtflags f(std::cerr.flags());\n> +\tstd::cerr << std::left;\n> +\n>  \tusageOptions(options_, indent);\n> +\n> +\tstd::cerr.flags(f);\n>  }\n>  \n>  void OptionsParser::usageOptions(const std::list<Option> &options,\n> @@ -1031,7 +1036,7 @@ void OptionsParser::usageOptions(const std::list<Option> &options,\n>  \t\tif (option.isArray)\n>  \t\t\targument += \" ...\";\n>  \n> -\t\tstd::cerr << std::setw(indent) << std::left << argument;\n> +\t\tstd::cerr << std::setw(indent) << argument;\n>  \n>  \t\tfor (const char *help = option.help, *end = help; end; ) {\n>  \t\t\tend = strchr(help, '\\n');\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 159EBC0109\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 27 Jul 2021 10:24:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 76771687C3;\n\tTue, 27 Jul 2021 12:24:16 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3AF0360272\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Jul 2021 12:24:15 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C28073F2;\n\tTue, 27 Jul 2021 12:24:14 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"P2uKV1Oc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627381454;\n\tbh=PDf26wvnZ54UMTDArB/G1O+Rk2pD7vd9rQ7NPAA+V8A=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=P2uKV1OcGKltJhwsYlso7E/YTjPFAs9a3M5nXLTqqCViT9SDyq0GaZd8Fg6zLNf+x\n\tTAghJiyNpkPJD2xUTDXv6WU2SEUrChusM2vjkVmB1gAPhFtzBQgqgPHTCtuP3Gryu4\n\tibw1X5oVdD4cYUnndfqk6DACqo2mrX3KZW38aaA4=","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210723042353.6616-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<1fcadff6-e60b-835d-18eb-4a3e068ceef0@ideasonboard.com>","Date":"Tue, 27 Jul 2021 11:24:12 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210723042353.6616-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] cam: options: Restore std::cerr\n\tadjustement field","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]