From patchwork Mon May 11 01:25:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 209872 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C43EC38A2A for ; Mon, 11 May 2020 01:25:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA9172137B for ; Mon, 11 May 2020 01:25:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GdVJVUAP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728468AbgEKBZx (ORCPT ); Sun, 10 May 2020 21:25:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727789AbgEKBZw (ORCPT ); Sun, 10 May 2020 21:25:52 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC0E5C061A0E for ; Sun, 10 May 2020 18:25:52 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id k19so3242567pll.9 for ; Sun, 10 May 2020 18:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aSYsvPNtmzRvpPUvQgJbBEd3TsrxkeW0SIef6rMzOLI=; b=GdVJVUAP7SzKlW7icsnQuJUQqLYLe6L3dYz5UlI1aBiFiMZX89KynLj+NdG3/3/L5F 1t30NCxUZl0l+jbW6MqAyB3LwFm82IOEcsBzZONdAGcDrRQG3bSTKAmG5H8IrWEu+hhy LUNiZE9mbhlQUrx0ySWpPChC1QpxBTaXAXP8yqqonm0A2+6lSBiyDl/YYx2vjE4sfuJu h78yfPDo+Qw4Ndq4MEoeTNthUWlJ68BsNYYEwNECLGj5sh9G/tsxUk5BeVGh+VcN7PkO bWKk7FIEvwAi4xHNlRFiPzV9zsTzzM+2DLSL48ToxybpVXTiJdNSUMuJE7CTvT1TOiqw xrwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aSYsvPNtmzRvpPUvQgJbBEd3TsrxkeW0SIef6rMzOLI=; b=qnrBHzJGkGv676xB6u84c2R18Y3Y8vFA+icmOonZaIK3JW3CKHuEAWYP64cVuQeo2P cZni4BPjfL6bdbI4PWmEKkOLG7l24J6HvbISKRDiTvzP4LXbswXuQVnQrZyk248PHhsj mgmpaU0PruiUy/3sjxDBzxAfBZ15VSP/r5UWMskl2p93BroScmPemw7usZAOoRp3rVDg UyYh/3Zn/3Oyt+QmEs/arU30cQ+2xjjjz3xOrv2RPw8+bEMaGvxF60bZQ4fuBgE20tS1 sXGBssBoIFm7PQWauTh67uc5mlV2GmwTwhvMyzIKasHyMupUO4M++5192/cH9ZMu36dS pQGQ== X-Gm-Message-State: AGi0Puan8eqGuTpwSAhDaSd/nbx//UZXWumd1DiUcgLzZQQdZaG7FFcy SyABbXucIc17hozcOU5rC9o+shiiHpM= X-Google-Smtp-Source: APiQypLqKFRBvpjaPO1VHT/3gN1JVTn34TpRgYQev5w3F73ZABreFZMxZnhGWC9VSSPrH8u5BtQWDw== X-Received: by 2002:a17:902:9f8a:: with SMTP id g10mr12925903plq.233.1589160352001; Sun, 10 May 2020 18:25:52 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id l1sm4630674pgj.48.2020.05.10.18.25.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 18:25:51 -0700 (PDT) From: Rosen Penev To: linux-media@vger.kernel.org Subject: [PATCH 2/3] utils: switch strstr to std variant Date: Sun, 10 May 2020 18:25:48 -0700 Message-Id: <20200511012549.1145814-2-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511012549.1145814-1-rosenp@gmail.com> References: <20200511012549.1145814-1-rosenp@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org strstr has const overloads in std, avoiding pointless conversions. Signed-off-by: Rosen Penev --- utils/libcecutil/cec-log.cpp | 2 +- utils/v4l2-ctl/v4l2-ctl-common.cpp | 4 ++-- utils/v4l2-ctl/v4l2-ctl-misc.cpp | 6 +++--- utils/v4l2-dbg/v4l2-dbg.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/libcecutil/cec-log.cpp b/utils/libcecutil/cec-log.cpp index 9410c071..0dcb4675 100644 --- a/utils/libcecutil/cec-log.cpp +++ b/utils/libcecutil/cec-log.cpp @@ -62,7 +62,7 @@ static void log_arg(const struct cec_arg *arg, const char *arg_name, __u32 val) } return; case CEC_ARG_TYPE_U16: - if (strstr(arg_name, "phys-addr")) + if (std::strstr(arg_name, "phys-addr")) printf("\t%s: %x.%x.%x.%x\n", arg_name, cec_phys_addr_exp(val)); else printf("\t%s: %u (0x%04x)\n", arg_name, val, val); diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp index 47f5da1a..0640a521 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp @@ -1190,13 +1190,13 @@ void common_get(cv4l_fd &_fd) char *q; buf[len] = 0; - while ((q = strstr(p, "START STATUS"))) { + while ((q = std::strstr(p, "START STATUS"))) { p = q + 1; } if (p) { while (p > buf && *p != '<') p--; q = p; - while ((q = strstr(q, "<6>"))) { + while ((q = std::strstr(q, "<6>"))) { memcpy(q, " ", 3); } printf("%s", p); diff --git a/utils/v4l2-ctl/v4l2-ctl-misc.cpp b/utils/v4l2-ctl/v4l2-ctl-misc.cpp index 6db87568..deb481b4 100644 --- a/utils/v4l2-ctl/v4l2-ctl-misc.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-misc.cpp @@ -212,11 +212,11 @@ void misc_cmd(int ch, char *optarg) jpegcomp.quality = strtol(value, 0L, 0); break; case 17: - if (strstr(value, "dht")) + if (std::strstr(value, "dht")) jpegcomp.jpeg_markers |= V4L2_JPEG_MARKER_DHT; - if (strstr(value, "dqt")) + if (std::strstr(value, "dqt")) jpegcomp.jpeg_markers |= V4L2_JPEG_MARKER_DQT; - if (strstr(value, "dri")) + if (std::strstr(value, "dri")) jpegcomp.jpeg_markers |= V4L2_JPEG_MARKER_DRI; break; case 18: diff --git a/utils/v4l2-dbg/v4l2-dbg.cpp b/utils/v4l2-dbg/v4l2-dbg.cpp index 86266376..06301ae0 100644 --- a/utils/v4l2-dbg/v4l2-dbg.cpp +++ b/utils/v4l2-dbg/v4l2-dbg.cpp @@ -784,14 +784,14 @@ list_done: char *q; buf[len] = 0; - while ((q = strstr(p, "START STATUS"))) { + while ((q = std::strstr(p, "START STATUS"))) { found_status = true; p = q + 1; } if (found_status) { while (p > buf && *p != '<') p--; q = p; - while ((q = strstr(q, "<6>"))) { + while ((q = std::strstr(q, "<6>"))) { memcpy(q, " ", 3); } printf("%s", p); From patchwork Mon May 11 01:25:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 209871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B50E6C54E8F for ; Mon, 11 May 2020 01:25:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 80CB1208CA for ; Mon, 11 May 2020 01:25:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZseMwQ5R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729217AbgEKBZz (ORCPT ); Sun, 10 May 2020 21:25:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727789AbgEKBZy (ORCPT ); Sun, 10 May 2020 21:25:54 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2185AC061A0C for ; Sun, 10 May 2020 18:25:54 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id t9so7052924pjw.0 for ; Sun, 10 May 2020 18:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jJpEXMTkMDbs7tm65zfU4R5oSSlPAiGAmIJ2+g9uq8s=; b=ZseMwQ5RVgtQRYpTFq4kIKRwqBLcbMEzKR/9txh9ETpr3BQ9FNM5fu7A9PU/fEKFkE kN/0aUC3/JBxrBSYGE9wZyCjm4clWrXXp/FexDuSZBdoyRZmdV06UnOKQ3o/43f9WfQg eDB7NYgbXnHWSCtKwT5EUwsx6h9D3+RSLlIMK8rezKJLUDoqzRI0JWAamlmHJAqFNBXk Y6tEK1nkggpPkVbxs1yDVCp+n0nhQd9d3ADNpW+IW0Tw6okQQUg52+2RNliAz+uaD9YA QvjvituvI6LBKEMMxh8N09Pq6dSFWqW/miS6IG2hUbqvQaEpBljc5/rDYQwFaJHtF/6O Me1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jJpEXMTkMDbs7tm65zfU4R5oSSlPAiGAmIJ2+g9uq8s=; b=lbkOWb1l+8URtWmAQJWNyW9RN15cUSN4jpj2zflWgarXVXmJGgy8AOYDSnDAJul1gG jIlRt5YqBaCT2ZoIM8hz16hKBdkfoDjmh+PXA+hmuCW3DpgtZx3nn3YzXb12sX4eyazV z6YP3KdpqqokfroKn1Q5l1PWLGpuAunI/Pb8oas+edS94JpRs2EK5ZJjZwERnszGDJk9 XCqCx4oMlkCu+JIY3thGZHIS+F4hfe0NYBVKKO20ooYrUpzyqPHWzbwaV1WVCPdWMmvZ 1+QiRKQNTtQIoW8Py1DCdkXijN3N+avz4bV+P5A448OZHp2FQc/R0oGJBObqGBX/tD55 8zEQ== X-Gm-Message-State: AGi0PuZvfgYV6pRp7W+5L/2o7UI0qozoGcU6tV6LMfs/srSpYLkCvbaS zYF/FKRZ1t/xWTbDVK3bg+BrVHuLzkw= X-Google-Smtp-Source: APiQypIVXKyQMq7QcxUEjeTu1mK8hbcA9/BrwvagQDAnRBNPuMX/1ZQX7g+hq1voCozyGTi0a8UUgw== X-Received: by 2002:a17:902:9a43:: with SMTP id x3mr12847463plv.332.1589160352923; Sun, 10 May 2020 18:25:52 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id l1sm4630674pgj.48.2020.05.10.18.25.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 18:25:52 -0700 (PDT) From: Rosen Penev To: linux-media@vger.kernel.org Subject: [PATCH 3/3] utils: switch C to C++ headers Date: Sun, 10 May 2020 18:25:49 -0700 Message-Id: <20200511012549.1145814-3-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511012549.1145814-1-rosenp@gmail.com> References: <20200511012549.1145814-1-rosenp@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Recently, I changed exit() to the std variant, which caused build failures on older platforms. Switch all headers to the C++ variants to avoid this. These C headers are deprecated by C++14. Signed-off-by: Rosen Penev --- utils/cec-compliance/cec-compliance.cpp | 10 +++++----- utils/cec-compliance/cec-test-adapter.cpp | 10 +++++----- utils/cec-compliance/cec-test-audio.cpp | 10 +++++----- utils/cec-compliance/cec-test-fuzzing.cpp | 10 +++++----- utils/cec-compliance/cec-test-power.cpp | 10 +++++----- utils/cec-compliance/cec-test.cpp | 8 ++++---- utils/cec-ctl/cec-ctl.cpp | 10 +++++----- utils/cec-ctl/cec-pin.cpp | 12 ++++++------ utils/cec-follower/cec-follower.cpp | 8 ++++---- utils/cec-follower/cec-processing.cpp | 10 +++++----- utils/cec-follower/cec-tuner.cpp | 2 +- utils/common/media-info.cpp | 10 +++++----- utils/common/v4l2-info.cpp | 10 +++++----- utils/libcecutil/cec-info.cpp | 2 +- utils/libcecutil/cec-log.cpp | 8 ++++---- utils/libcecutil/cec-parse.cpp | 10 +++++----- utils/rds-ctl/rds-ctl.cpp | 14 +++++++------- utils/v4l2-compliance/v4l2-compliance.cpp | 12 ++++++------ utils/v4l2-compliance/v4l2-test-buffers.cpp | 10 +++++----- utils/v4l2-compliance/v4l2-test-codecs.cpp | 12 ++++++------ utils/v4l2-compliance/v4l2-test-colors.cpp | 12 ++++++------ utils/v4l2-compliance/v4l2-test-controls.cpp | 10 +++++----- utils/v4l2-compliance/v4l2-test-debug.cpp | 12 ++++++------ utils/v4l2-compliance/v4l2-test-formats.cpp | 12 ++++++------ utils/v4l2-compliance/v4l2-test-input-output.cpp | 10 +++++----- utils/v4l2-compliance/v4l2-test-io-config.cpp | 10 +++++----- utils/v4l2-compliance/v4l2-test-media.cpp | 12 ++++++------ utils/v4l2-compliance/v4l2-test-subdevs.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-common.cpp | 10 +++++----- utils/v4l2-ctl/v4l2-ctl-edid.cpp | 8 ++++---- utils/v4l2-ctl/v4l2-ctl-io.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-meta.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-misc.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-modes.cpp | 4 ++-- utils/v4l2-ctl/v4l2-ctl-overlay.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-sdr.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-selection.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-stds.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 10 +++++----- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 10 +++++----- utils/v4l2-ctl/v4l2-ctl-vbi.cpp | 10 +++++----- utils/v4l2-ctl/v4l2-ctl-vidcap.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl-vidout.cpp | 12 ++++++------ utils/v4l2-ctl/v4l2-ctl.cpp | 12 ++++++------ utils/v4l2-dbg/v4l2-dbg.cpp | 10 +++++----- 46 files changed, 236 insertions(+), 236 deletions(-) diff --git a/utils/cec-compliance/cec-compliance.cpp b/utils/cec-compliance/cec-compliance.cpp index d0580579..60298846 100644 --- a/utils/cec-compliance/cec-compliance.cpp +++ b/utils/cec-compliance/cec-compliance.cpp @@ -4,17 +4,17 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/cec-compliance/cec-test-adapter.cpp b/utils/cec-compliance/cec-test-adapter.cpp index df7374df..b7a8159d 100644 --- a/utils/cec-compliance/cec-test-adapter.cpp +++ b/utils/cec-compliance/cec-test-adapter.cpp @@ -4,16 +4,16 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/cec-compliance/cec-test-audio.cpp b/utils/cec-compliance/cec-test-audio.cpp index d422a7da..edf528c9 100644 --- a/utils/cec-compliance/cec-test-audio.cpp +++ b/utils/cec-compliance/cec-test-audio.cpp @@ -4,15 +4,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/utils/cec-compliance/cec-test-fuzzing.cpp b/utils/cec-compliance/cec-test-fuzzing.cpp index ce0bf12d..708a8ec3 100644 --- a/utils/cec-compliance/cec-test-fuzzing.cpp +++ b/utils/cec-compliance/cec-test-fuzzing.cpp @@ -4,15 +4,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/cec-compliance/cec-test-power.cpp b/utils/cec-compliance/cec-test-power.cpp index 2758c36d..e35264aa 100644 --- a/utils/cec-compliance/cec-test-power.cpp +++ b/utils/cec-compliance/cec-test-power.cpp @@ -4,15 +4,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp index a84f83d3..1a05c5ae 100644 --- a/utils/cec-compliance/cec-test.cpp +++ b/utils/cec-compliance/cec-test.cpp @@ -6,14 +6,14 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp index 899b83b1..3c6c6f98 100644 --- a/utils/cec-ctl/cec-ctl.cpp +++ b/utils/cec-ctl/cec-ctl.cpp @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -15,10 +15,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/utils/cec-ctl/cec-pin.cpp b/utils/cec-ctl/cec-pin.cpp index c09d6bbd..3ff4734f 100644 --- a/utils/cec-ctl/cec-pin.cpp +++ b/utils/cec-ctl/cec-pin.cpp @@ -4,19 +4,19 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp index 589426ec..c6e0a1d1 100644 --- a/utils/cec-follower/cec-follower.cpp +++ b/utils/cec-follower/cec-follower.cpp @@ -6,15 +6,15 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/cec-follower/cec-processing.cpp b/utils/cec-follower/cec-processing.cpp index bc8c9c09..e2c5c8e2 100644 --- a/utils/cec-follower/cec-processing.cpp +++ b/utils/cec-follower/cec-processing.cpp @@ -4,16 +4,16 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/utils/cec-follower/cec-tuner.cpp b/utils/cec-follower/cec-tuner.cpp index 4aecebce..7ac0decb 100644 --- a/utils/cec-follower/cec-tuner.cpp +++ b/utils/cec-follower/cec-tuner.cpp @@ -4,7 +4,7 @@ */ #include -#include +#include #include "cec-follower.h" #include "compiler.h" diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp index 8aa12f34..d37c5acb 100644 --- a/utils/common/media-info.cpp +++ b/utils/common/media-info.cpp @@ -4,15 +4,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/common/v4l2-info.cpp b/utils/common/v4l2-info.cpp index 0aac8504..28116fd3 100644 --- a/utils/common/v4l2-info.cpp +++ b/utils/common/v4l2-info.cpp @@ -4,15 +4,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/libcecutil/cec-info.cpp b/utils/libcecutil/cec-info.cpp index f6e60918..ed244437 100644 --- a/utils/libcecutil/cec-info.cpp +++ b/utils/libcecutil/cec-info.cpp @@ -5,7 +5,7 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include +#include #include #include #include diff --git a/utils/libcecutil/cec-log.cpp b/utils/libcecutil/cec-log.cpp index 0dcb4675..40028630 100644 --- a/utils/libcecutil/cec-log.cpp +++ b/utils/libcecutil/cec-log.cpp @@ -4,11 +4,11 @@ */ #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include "cec-htng-funcs.h" diff --git a/utils/libcecutil/cec-parse.cpp b/utils/libcecutil/cec-parse.cpp index 8c869fec..024b6285 100644 --- a/utils/libcecutil/cec-parse.cpp +++ b/utils/libcecutil/cec-parse.cpp @@ -4,8 +4,8 @@ */ #include -#include -#include +#include +#include #include #include #include @@ -13,10 +13,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/utils/rds-ctl/rds-ctl.cpp b/utils/rds-ctl/rds-ctl.cpp index 73fc7e3c..fbc4d310 100644 --- a/utils/rds-ctl/rds-ctl.cpp +++ b/utils/rds-ctl/rds-ctl.cpp @@ -8,21 +8,21 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp index 549e37f7..49606975 100644 --- a/utils/v4l2-compliance/v4l2-compliance.cpp +++ b/utils/v4l2-compliance/v4l2-compliance.cpp @@ -21,22 +21,22 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include "v4l2-compliance.h" diff --git a/utils/v4l2-compliance/v4l2-test-buffers.cpp b/utils/v4l2-compliance/v4l2-test-buffers.cpp index fc49fff6..e2df126d 100644 --- a/utils/v4l2-compliance/v4l2-test-buffers.cpp +++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp @@ -19,9 +19,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/v4l2-compliance/v4l2-test-codecs.cpp b/utils/v4l2-compliance/v4l2-test-codecs.cpp index 3fd44c8b..377574ec 100644 --- a/utils/v4l2-compliance/v4l2-test-codecs.cpp +++ b/utils/v4l2-compliance/v4l2-test-codecs.cpp @@ -19,17 +19,17 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include "v4l2-compliance.h" int testEncoder(struct node *node) diff --git a/utils/v4l2-compliance/v4l2-test-colors.cpp b/utils/v4l2-compliance/v4l2-test-colors.cpp index 09d29a3e..6996877d 100644 --- a/utils/v4l2-compliance/v4l2-test-colors.cpp +++ b/utils/v4l2-compliance/v4l2-test-colors.cpp @@ -15,19 +15,19 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include "compiler.h" #include "v4l2-compliance.h" diff --git a/utils/v4l2-compliance/v4l2-test-controls.cpp b/utils/v4l2-compliance/v4l2-test-controls.cpp index d81dddb2..c3c27119 100644 --- a/utils/v4l2-compliance/v4l2-test-controls.cpp +++ b/utils/v4l2-compliance/v4l2-test-controls.cpp @@ -19,15 +19,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/utils/v4l2-compliance/v4l2-test-debug.cpp b/utils/v4l2-compliance/v4l2-test-debug.cpp index 3f43e661..206b4b82 100644 --- a/utils/v4l2-compliance/v4l2-test-debug.cpp +++ b/utils/v4l2-compliance/v4l2-test-debug.cpp @@ -19,19 +19,19 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include "v4l2-compliance.h" int testRegister(struct node *node) diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp index e1b00f3c..7780442e 100644 --- a/utils/v4l2-compliance/v4l2-test-formats.cpp +++ b/utils/v4l2-compliance/v4l2-test-formats.cpp @@ -19,17 +19,17 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include "compiler.h" #include "v4l2-compliance.h" diff --git a/utils/v4l2-compliance/v4l2-test-input-output.cpp b/utils/v4l2-compliance/v4l2-test-input-output.cpp index 80ecf75d..a7fe81d8 100644 --- a/utils/v4l2-compliance/v4l2-test-input-output.cpp +++ b/utils/v4l2-compliance/v4l2-test-input-output.cpp @@ -19,15 +19,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include "v4l2-compliance.h" diff --git a/utils/v4l2-compliance/v4l2-test-io-config.cpp b/utils/v4l2-compliance/v4l2-test-io-config.cpp index 9ade11e8..be885cb3 100644 --- a/utils/v4l2-compliance/v4l2-test-io-config.cpp +++ b/utils/v4l2-compliance/v4l2-test-io-config.cpp @@ -19,15 +19,15 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include "v4l2-compliance.h" diff --git a/utils/v4l2-compliance/v4l2-test-media.cpp b/utils/v4l2-compliance/v4l2-test-media.cpp index bcd8a725..94c25932 100644 --- a/utils/v4l2-compliance/v4l2-test-media.cpp +++ b/utils/v4l2-compliance/v4l2-test-media.cpp @@ -19,19 +19,19 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/utils/v4l2-compliance/v4l2-test-subdevs.cpp b/utils/v4l2-compliance/v4l2-test-subdevs.cpp index 489639fb..54d3c430 100644 --- a/utils/v4l2-compliance/v4l2-test-subdevs.cpp +++ b/utils/v4l2-compliance/v4l2-test-subdevs.cpp @@ -19,17 +19,17 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include +#include #include "v4l2-compliance.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp index 0640a521..bf267432 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp @@ -1,18 +1,18 @@ #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-edid.cpp b/utils/v4l2-ctl/v4l2-ctl-edid.cpp index b13d8209..d028d248 100644 --- a/utils/v4l2-ctl/v4l2-ctl-edid.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-edid.cpp @@ -1,12 +1,12 @@ #include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-io.cpp b/utils/v4l2-ctl/v4l2-ctl-io.cpp index 9e83c03a..379198b5 100644 --- a/utils/v4l2-ctl/v4l2-ctl-io.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-io.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-meta.cpp b/utils/v4l2-ctl/v4l2-ctl-meta.cpp index 3e71a6eb..718be765 100644 --- a/utils/v4l2-ctl/v4l2-ctl-meta.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-meta.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-misc.cpp b/utils/v4l2-ctl/v4l2-ctl-misc.cpp index deb481b4..5a89aa7e 100644 --- a/utils/v4l2-ctl/v4l2-ctl-misc.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-misc.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-modes.cpp b/utils/v4l2-ctl/v4l2-ctl-modes.cpp index b311ce5d..e076be6e 100644 --- a/utils/v4l2-ctl/v4l2-ctl-modes.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-modes.cpp @@ -6,8 +6,8 @@ * reserved. */ -#include -#include +#include + #include "v4l2-ctl.h" static bool valid_params(int width, int height, int refresh_rate) diff --git a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp index 16344a15..a16e10db 100644 --- a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/utils/v4l2-ctl/v4l2-ctl-sdr.cpp b/utils/v4l2-ctl/v4l2-ctl-sdr.cpp index 71a65913..67603285 100644 --- a/utils/v4l2-ctl/v4l2-ctl-sdr.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-sdr.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-selection.cpp b/utils/v4l2-ctl/v4l2-ctl-selection.cpp index be62eb03..9f3e0397 100644 --- a/utils/v4l2-ctl/v4l2-ctl-selection.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-selection.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-stds.cpp b/utils/v4l2-ctl/v4l2-ctl-stds.cpp index 8dd06c43..3eb67316 100644 --- a/utils/v4l2-ctl/v4l2-ctl-stds.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-stds.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index 8578610d..fab8f36b 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -1,8 +1,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -11,13 +11,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include "compiler.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-subdev.cpp b/utils/v4l2-ctl/v4l2-ctl-subdev.cpp index 9e17a58d..1bf35b1d 100644 --- a/utils/v4l2-ctl/v4l2-ctl-subdev.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-subdev.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-tuner.cpp b/utils/v4l2-ctl/v4l2-ctl-tuner.cpp index 981b8765..54635998 100644 --- a/utils/v4l2-ctl/v4l2-ctl-tuner.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-tuner.cpp @@ -1,14 +1,14 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp index ee55012f..c09bc3e2 100644 --- a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp @@ -1,19 +1,19 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "compiler.h" #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp b/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp index 6e920c1d..68896248 100644 --- a/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl-vidout.cpp b/utils/v4l2-ctl/v4l2-ctl-vidout.cpp index e3cb4bcb..39952eef 100644 --- a/utils/v4l2-ctl/v4l2-ctl-vidout.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-vidout.cpp @@ -1,18 +1,18 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include "v4l2-ctl.h" diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp index e7b270cd..3d784bc2 100644 --- a/utils/v4l2-ctl/v4l2-ctl.cpp +++ b/utils/v4l2-ctl/v4l2-ctl.cpp @@ -21,22 +21,22 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include diff --git a/utils/v4l2-dbg/v4l2-dbg.cpp b/utils/v4l2-dbg/v4l2-dbg.cpp index 06301ae0..765362f6 100644 --- a/utils/v4l2-dbg/v4l2-dbg.cpp +++ b/utils/v4l2-dbg/v4l2-dbg.cpp @@ -17,18 +17,18 @@ */ #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include -#include +#include #ifdef ANDROID #include