{"id":13105,"url":"https://patchwork.libcamera.org/api/1.1/patches/13105/?format=json","web_url":"https://patchwork.libcamera.org/patch/13105/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210723042353.6616-1-laurent.pinchart@ideasonboard.com>","date":"2021-07-23T04:23:53","name":"[libcamera-devel] cam: options: Restore std::cerr adjustement field","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"25cdc3c086542165ea548f8f1d78922eb7b28687","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13105/mbox/","series":[{"id":2272,"url":"https://patchwork.libcamera.org/api/1.1/series/2272/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2272","date":"2021-07-23T04:23:53","name":"[libcamera-devel] cam: options: Restore std::cerr adjustement field","version":1,"mbox":"https://patchwork.libcamera.org/series/2272/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13105/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13105/checks/","tags":{},"headers":{"Return-Path":"","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 73E34C322B\n\tfor ;\n\tFri, 23 Jul 2021 04:24:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E4D26687A6;\n\tFri, 23 Jul 2021 06:23:59 +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 3898F687A6\n\tfor ;\n\tFri, 23 Jul 2021 06:23:58 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C31FD255\n\tfor ;\n\tFri, 23 Jul 2021 06:23:57 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"C6WIEwKV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627014237;\n\tbh=RWDsT67eaptEDPfQx4cO+5u+fnwxsmMawAlPNAY/7e0=;\n\th=From:To:Subject:Date:From;\n\tb=C6WIEwKVmY3OCvixovfVAEAO/cWwz9gUbYLYC+Vb/Dei6BS1rbMDl8QzExf6HZW1w\n\taNLqf0x8dY5sMH/LoL6kmJ+EsmbeBMc0GFgDQvfu1oAyCE0nUuBCDlWBdtdFb8/f2a\n\tagmJJxbEDT/PHuGIaV3069Ppxank0MsLcMPut03U=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 23 Jul 2021 07:23:53 +0300","Message-Id":"<20210723042353.6616-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The std::cerr adjustment is set to std::left to print the usage text.\nRestore it to its original value when done, to avoid affecting the\ncaller.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/options.cpp | 9 +++++++--\n 1 file changed, 7 insertions(+), 2 deletions(-)","diff":"diff --git a/src/cam/options.cpp b/src/cam/options.cpp\nindex 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