[1/7] utils: replace strchr with std variant

Message ID	20200429040627.27859-1-rosenp@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Hru2=6N=vger.kernel.org=linux-media-owner@kernel.org> From: Rosen Penev <rosenp@gmail.com> To: linux-media@vger.kernel.org Subject: [PATCH 1/7] utils: replace strchr with std variant Date: Tue, 28 Apr 2020 21:06:21 -0700 Message-Id: <20200429040627.27859-1-rosenp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk
Series	[1/7] utils: replace strchr with std variant \| expand [1/7] utils: replace strchr with std variant [2/7] utils: replace strrchr with std variant [3/7] utils: convert all is* functions to std [4/7] utils: convert all string to number functions to std [5/7] v4l-utils: fix compilation with libcxx [6/7] compiler: fix compilation with clang + std=c++98 + glibcxx [7/7] utils: switch C to C++ headers

Message ID

20200429040627.27859-1-rosenp@gmail.com (mailing list archive)

State

New, archived

Headers

From: Rosen Penev <rosenp@gmail.com>
To: linux-media@vger.kernel.org
Subject: [PATCH 1/7] utils: replace strchr with std variant
Date: Tue, 28 Apr 2020 21:06:21 -0700
Message-Id: <20200429040627.27859-1-rosenp@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk

Series

[1/7] utils: replace strchr with std variant | expand

Commit Message

Rosen Penev April 29, 2020, 4:06 a.m. UTC

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 utils/cec-compliance/cec-test.cpp         |  5 +++--
 utils/cec-ctl/cec-ctl.cpp                 | 13 +++++++------
 utils/cec-follower/cec-follower.cpp       |  5 +++--
 utils/libcecutil/cec-parse.cpp            |  4 ++--
 utils/v4l2-compliance/v4l2-compliance.cpp |  5 +++--
 utils/v4l2-ctl/v4l2-ctl-common.cpp        |  8 ++++----
 utils/v4l2-ctl/v4l2-ctl-edid.cpp          |  5 +++--
 utils/v4l2-ctl/v4l2-ctl-streaming.cpp     |  7 ++++---
 utils/v4l2-ctl/v4l2-ctl-vbi.cpp           |  5 +++--
 utils/v4l2-dbg/v4l2-dbg.cpp               |  4 ++--
 10 files changed, 34 insertions(+), 27 deletions(-)

Comments

Hans Verkuil May 5, 2020, 8:53 a.m. UTC | #1

Hi Rosen,

Why this change? The commit log is empty, so I have no idea what the reason
is for making this change. Same for the next 3 patches.

Regards,

	Hans

On 29/04/2020 06:06, Rosen Penev wrote:
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---
>  utils/cec-compliance/cec-test.cpp         |  5 +++--
>  utils/cec-ctl/cec-ctl.cpp                 | 13 +++++++------
>  utils/cec-follower/cec-follower.cpp       |  5 +++--
>  utils/libcecutil/cec-parse.cpp            |  4 ++--
>  utils/v4l2-compliance/v4l2-compliance.cpp |  5 +++--
>  utils/v4l2-ctl/v4l2-ctl-common.cpp        |  8 ++++----
>  utils/v4l2-ctl/v4l2-ctl-edid.cpp          |  5 +++--
>  utils/v4l2-ctl/v4l2-ctl-streaming.cpp     |  7 ++++---
>  utils/v4l2-ctl/v4l2-ctl-vbi.cpp           |  5 +++--
>  utils/v4l2-dbg/v4l2-dbg.cpp               |  4 ++--
>  10 files changed, 34 insertions(+), 27 deletions(-)
> 
> diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp
> index 50d434b9..a84f83d3 100644
> --- a/utils/cec-compliance/cec-test.cpp
> +++ b/utils/cec-compliance/cec-test.cpp
> @@ -3,10 +3,11 @@
>   * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
>   */
>  
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <sys/types.h>
>  #include <sys/stat.h>
> @@ -1530,7 +1531,7 @@ void listTests()
>  
>  int setExpectedResult(char *optarg, bool no_warnings)
>  {
> -	char *equal = strchr(optarg, '=');
> +	char *equal = std::strchr(optarg, '=');
>  
>  	if (!equal || equal == optarg || !isdigit(equal[1]))
>  		return 1;
> diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp
> index b8edb105..7db7ca38 100644
> --- a/utils/cec-ctl/cec-ctl.cpp
> +++ b/utils/cec-ctl/cec-ctl.cpp
> @@ -3,10 +3,11 @@
>   * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
>   */
>  
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -1917,7 +1918,7 @@ int main(int argc, char **argv)
>  		case OptIgnore: {
>  			bool all_la = !strncmp(optarg, "all", 3);
>  			bool all_opcodes = true;
> -			const char *sep = strchr(optarg, ',');
> +			const char *sep = std::strchr(optarg, ',');
>  			unsigned la_mask = 0xffff, opcode, la = 0;
>  
>  			if (sep)
> @@ -2068,7 +2069,7 @@ int main(int argc, char **argv)
>  							size--;
>  							break;
>  						}
> -						value = strchr(value, ':');
> +						value = std::strchr(value, ':');
>  						if (value == NULL)
>  							break;
>  						value++;
> @@ -2109,7 +2110,7 @@ int main(int argc, char **argv)
>  							size--;
>  							break;
>  						}
> -						value = strchr(value, ':');
> +						value = std::strchr(value, ':');
>  						if (value == NULL)
>  							break;
>  						value++;
> @@ -2150,7 +2151,7 @@ int main(int argc, char **argv)
>  							size--;
>  							break;
>  						}
> -						value = strchr(value, ':');
> +						value = std::strchr(value, ':');
>  						if (value == NULL)
>  							break;
>  						value++;
> @@ -2184,7 +2185,7 @@ int main(int argc, char **argv)
>  							size--;
>  							break;
>  						}
> -						value = strchr(value, ':');
> +						value = std::strchr(value, ':');
>  						if (value == NULL)
>  							break;
>  						value++;
> diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp
> index 7c8c044e..589426ec 100644
> --- a/utils/cec-follower/cec-follower.cpp
> +++ b/utils/cec-follower/cec-follower.cpp
> @@ -3,10 +3,11 @@
>   * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
>   */
>  
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -386,7 +387,7 @@ int main(int argc, char **argv)
>  		case OptIgnore: {
>  			bool all_la = !strncmp(optarg, "all", 3);
>  			bool all_opcodes = true;
> -			const char *sep = strchr(optarg, ',');
> +			const char *sep = std::strchr(optarg, ',');
>  			unsigned la_mask = 0xffff, opcode, la = 0;
>  
>  			if (sep)
> diff --git a/utils/libcecutil/cec-parse.cpp b/utils/libcecutil/cec-parse.cpp
> index 5fffcce7..8c869fec 100644
> --- a/utils/libcecutil/cec-parse.cpp
> +++ b/utils/libcecutil/cec-parse.cpp
> @@ -6,7 +6,6 @@
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -18,6 +17,7 @@
>  #include <errno.h>
>  #include <sys/ioctl.h>
>  #include <stdarg.h>
> +#include <cstring>
>  #include <ctime>
>  #include <cerrno>
>  #include <string>
> @@ -191,7 +191,7 @@ unsigned cec_parse_phys_addr(const char *value)
>  {
>  	unsigned p1, p2, p3, p4;
>  
> -	if (!strchr(value, '.'))
> +	if (!std::strchr(value, '.'))
>  		return strtoul(value, NULL, 0);
>  	if (sscanf(value, "%x.%x.%x.%x", &p1, &p2, &p3, &p4) != 4) {
>  		fprintf(stderr, "Expected a physical address of the form x.x.x.x\n");
> diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp
> index da8a7d10..5b715fa5 100644
> --- a/utils/v4l2-compliance/v4l2-compliance.cpp
> +++ b/utils/v4l2-compliance/v4l2-compliance.cpp
> @@ -18,10 +18,11 @@
>      Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
>   */
>  
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -1580,7 +1581,7 @@ int main(int argc, char **argv)
>  			break;
>  		case OptStreamFrom:
>  		case OptStreamFromHdr: {
> -			char *equal = strchr(optarg, '=');
> +			char *equal = std::strchr(optarg, '=');
>  			bool has_hdr = ch == OptStreamFromHdr;
>  
>  			if (equal == optarg)
> diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
> index bbd00e95..764d984a 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
> @@ -1,7 +1,6 @@
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -22,6 +21,7 @@
>  #include <sys/klog.h>
>  #endif
>  
> +#include <cstring>
>  #include <list>
>  #include <vector>
>  #include <map>
> @@ -741,7 +741,7 @@ static bool parse_subset(char *optarg)
>  
>  	memset(&subset, 0, sizeof(subset));
>  	while (*optarg) {
> -		p = strchr(optarg, ',');
> +		p = std::strchr(optarg, ',');
>  		if (p)
>  			*p = 0;
>  		if (optarg[0] == 0) {
> @@ -808,7 +808,7 @@ void common_cmd(const std::string &media_bus_info, int ch, char *optarg)
>  				common_usage();
>  				std::exit(EXIT_FAILURE);
>  			}
> -			if (strchr(value, '=')) {
> +			if (std::strchr(value, '=')) {
>  				common_usage();
>  				std::exit(EXIT_FAILURE);
>  			}
> @@ -824,7 +824,7 @@ void common_cmd(const std::string &media_bus_info, int ch, char *optarg)
>  				common_usage();
>  				std::exit(EXIT_FAILURE);
>  			}
> -			if (const char *equal = strchr(value, '=')) {
> +			if (const char *equal = std::strchr(value, '=')) {
>  				set_ctrls[std::string(value, (equal - value))] = equal + 1;
>  			}
>  			else {
> diff --git a/utils/v4l2-ctl/v4l2-ctl-edid.cpp b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
> index a2df6089..b13d8209 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-edid.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
> @@ -1,7 +1,8 @@
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <fcntl.h>
>  #include <ctype.h>
> @@ -710,7 +711,7 @@ static unsigned short parse_phys_addr(const char *value)
>  {
>  	unsigned p1, p2, p3, p4;
>  
> -	if (!strchr(value, '.'))
> +	if (!std::strchr(value, '.'))
>  		return strtoul(value, NULL, 0);
>  	if (sscanf(value, "%x.%x.%x.%x", &p1, &p2, &p3, &p4) != 4) {
>  		fprintf(stderr, "Expected a physical address of the form x.x.x.x\n");
> diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> index 95ffe986..59783ff3 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
> @@ -1,7 +1,8 @@
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -1660,7 +1661,7 @@ static FILE *open_output_file(cv4l_fd &fd)
>  	if (!host_to)
>  		return NULL;
>  
> -	char *p = strchr(host_to, ':');
> +	char *p = std::strchr(host_to, ':');
>  	struct sockaddr_in serv_addr;
>  	struct hostent *server;
>  	struct v4l2_fract aspect;
> @@ -1925,7 +1926,7 @@ static FILE *open_input_file(cv4l_fd &fd, __u32 type)
>  	if (!host_from)
>  		return NULL;
>  
> -	char *p = strchr(host_from, ':');
> +	char *p = std::strchr(host_from, ':');
>  	int listen_fd;
>  	socklen_t clilen;
>  	struct sockaddr_in serv_addr = {}, cli_addr;
> diff --git a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp
> index 6a4f627f..ee55012f 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp
> @@ -1,7 +1,8 @@
> +#include <cstring>
> +
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -98,7 +99,7 @@ void vbi_cmd(int ch, char *optarg)
>  			std::exit(EXIT_FAILURE);
>  		}
>  		while (*optarg) {
> -			subs = strchr(optarg, ',');
> +			subs = std::strchr(optarg, ',');
>  			if (subs)
>  				*subs = 0;
>  
> diff --git a/utils/v4l2-dbg/v4l2-dbg.cpp b/utils/v4l2-dbg/v4l2-dbg.cpp
> index f2fd8269..86266376 100644
> --- a/utils/v4l2-dbg/v4l2-dbg.cpp
> +++ b/utils/v4l2-dbg/v4l2-dbg.cpp
> @@ -19,7 +19,6 @@
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
>  #include <inttypes.h>
>  #include <getopt.h>
>  #include <sys/types.h>
> @@ -43,6 +42,7 @@
>  
>  #include <linux/videodev2.h>
>  
> +#include <cstring>
>  #include <list>
>  #include <vector>
>  #include <map>
> @@ -731,7 +731,7 @@ int main(int argc, char **argv)
>  			goto list_done;
>  		}
>  
> -		p = strchr(chip_info.name, ' ');
> +		p = std::strchr(chip_info.name, ' ');
>  		if (p)
>  			*p = '\0';
>  		name = chip_info.name;
>

diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp
index 50d434b9..a84f83d3 100644
--- a/utils/cec-compliance/cec-test.cpp
+++ b/utils/cec-compliance/cec-test.cpp
@@ -3,10 +3,11 @@ 
  * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
  */
 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1530,7 +1531,7 @@  void listTests()
 
 int setExpectedResult(char *optarg, bool no_warnings)
 {
-	char *equal = strchr(optarg, '=');
+	char *equal = std::strchr(optarg, '=');
 
 	if (!equal || equal == optarg || !isdigit(equal[1]))
 		return 1;
diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp
index b8edb105..7db7ca38 100644
--- a/utils/cec-ctl/cec-ctl.cpp
+++ b/utils/cec-ctl/cec-ctl.cpp
@@ -3,10 +3,11 @@ 
  * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
  */
 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -1917,7 +1918,7 @@  int main(int argc, char **argv)
 		case OptIgnore: {
 			bool all_la = !strncmp(optarg, "all", 3);
 			bool all_opcodes = true;
-			const char *sep = strchr(optarg, ',');
+			const char *sep = std::strchr(optarg, ',');
 			unsigned la_mask = 0xffff, opcode, la = 0;
 
 			if (sep)
@@ -2068,7 +2069,7 @@  int main(int argc, char **argv)
 							size--;
 							break;
 						}
-						value = strchr(value, ':');
+						value = std::strchr(value, ':');
 						if (value == NULL)
 							break;
 						value++;
@@ -2109,7 +2110,7 @@  int main(int argc, char **argv)
 							size--;
 							break;
 						}
-						value = strchr(value, ':');
+						value = std::strchr(value, ':');
 						if (value == NULL)
 							break;
 						value++;
@@ -2150,7 +2151,7 @@  int main(int argc, char **argv)
 							size--;
 							break;
 						}
-						value = strchr(value, ':');
+						value = std::strchr(value, ':');
 						if (value == NULL)
 							break;
 						value++;
@@ -2184,7 +2185,7 @@  int main(int argc, char **argv)
 							size--;
 							break;
 						}
-						value = strchr(value, ':');
+						value = std::strchr(value, ':');
 						if (value == NULL)
 							break;
 						value++;
diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp
index 7c8c044e..589426ec 100644
--- a/utils/cec-follower/cec-follower.cpp
+++ b/utils/cec-follower/cec-follower.cpp
@@ -3,10 +3,11 @@ 
  * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
  */
 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -386,7 +387,7 @@  int main(int argc, char **argv)
 		case OptIgnore: {
 			bool all_la = !strncmp(optarg, "all", 3);
 			bool all_opcodes = true;
-			const char *sep = strchr(optarg, ',');
+			const char *sep = std::strchr(optarg, ',');
 			unsigned la_mask = 0xffff, opcode, la = 0;
 
 			if (sep)
diff --git a/utils/libcecutil/cec-parse.cpp b/utils/libcecutil/cec-parse.cpp
index 5fffcce7..8c869fec 100644
--- a/utils/libcecutil/cec-parse.cpp
+++ b/utils/libcecutil/cec-parse.cpp
@@ -6,7 +6,6 @@ 
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -18,6 +17,7 @@ 
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <stdarg.h>
+#include <cstring>
 #include <ctime>
 #include <cerrno>
 #include <string>
@@ -191,7 +191,7 @@  unsigned cec_parse_phys_addr(const char *value)
 {
 	unsigned p1, p2, p3, p4;
 
-	if (!strchr(value, '.'))
+	if (!std::strchr(value, '.'))
 		return strtoul(value, NULL, 0);
 	if (sscanf(value, "%x.%x.%x.%x", &p1, &p2, &p3, &p4) != 4) {
 		fprintf(stderr, "Expected a physical address of the form x.x.x.x\n");
diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp
index da8a7d10..5b715fa5 100644
--- a/utils/v4l2-compliance/v4l2-compliance.cpp
+++ b/utils/v4l2-compliance/v4l2-compliance.cpp
@@ -18,10 +18,11 @@ 
     Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
  */
 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -1580,7 +1581,7 @@  int main(int argc, char **argv)
 			break;
 		case OptStreamFrom:
 		case OptStreamFromHdr: {
-			char *equal = strchr(optarg, '=');
+			char *equal = std::strchr(optarg, '=');
 			bool has_hdr = ch == OptStreamFromHdr;
 
 			if (equal == optarg)
diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
index bbd00e95..764d984a 100644
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
@@ -1,7 +1,6 @@ 
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -22,6 +21,7 @@ 
 #include <sys/klog.h>
 #endif
 
+#include <cstring>
 #include <list>
 #include <vector>
 #include <map>
@@ -741,7 +741,7 @@  static bool parse_subset(char *optarg)
 
 	memset(&subset, 0, sizeof(subset));
 	while (*optarg) {
-		p = strchr(optarg, ',');
+		p = std::strchr(optarg, ',');
 		if (p)
 			*p = 0;
 		if (optarg[0] == 0) {
@@ -808,7 +808,7 @@  void common_cmd(const std::string &media_bus_info, int ch, char *optarg)
 				common_usage();
 				std::exit(EXIT_FAILURE);
 			}
-			if (strchr(value, '=')) {
+			if (std::strchr(value, '=')) {
 				common_usage();
 				std::exit(EXIT_FAILURE);
 			}
@@ -824,7 +824,7 @@  void common_cmd(const std::string &media_bus_info, int ch, char *optarg)
 				common_usage();
 				std::exit(EXIT_FAILURE);
 			}
-			if (const char *equal = strchr(value, '=')) {
+			if (const char *equal = std::strchr(value, '=')) {
 				set_ctrls[std::string(value, (equal - value))] = equal + 1;
 			}
 			else {
diff --git a/utils/v4l2-ctl/v4l2-ctl-edid.cpp b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
index a2df6089..b13d8209 100644
--- a/utils/v4l2-ctl/v4l2-ctl-edid.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
@@ -1,7 +1,8 @@ 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <fcntl.h>
 #include <ctype.h>
@@ -710,7 +711,7 @@  static unsigned short parse_phys_addr(const char *value)
 {
 	unsigned p1, p2, p3, p4;
 
-	if (!strchr(value, '.'))
+	if (!std::strchr(value, '.'))
 		return strtoul(value, NULL, 0);
 	if (sscanf(value, "%x.%x.%x.%x", &p1, &p2, &p3, &p4) != 4) {
 		fprintf(stderr, "Expected a physical address of the form x.x.x.x\n");
diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
index 95ffe986..59783ff3 100644
--- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
@@ -1,7 +1,8 @@ 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -1660,7 +1661,7 @@  static FILE *open_output_file(cv4l_fd &fd)
 	if (!host_to)
 		return NULL;
 
-	char *p = strchr(host_to, ':');
+	char *p = std::strchr(host_to, ':');
 	struct sockaddr_in serv_addr;
 	struct hostent *server;
 	struct v4l2_fract aspect;
@@ -1925,7 +1926,7 @@  static FILE *open_input_file(cv4l_fd &fd, __u32 type)
 	if (!host_from)
 		return NULL;
 
-	char *p = strchr(host_from, ':');
+	char *p = std::strchr(host_from, ':');
 	int listen_fd;
 	socklen_t clilen;
 	struct sockaddr_in serv_addr = {}, cli_addr;
diff --git a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp
index 6a4f627f..ee55012f 100644
--- a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp
@@ -1,7 +1,8 @@ 
+#include <cstring>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -98,7 +99,7 @@  void vbi_cmd(int ch, char *optarg)
 			std::exit(EXIT_FAILURE);
 		}
 		while (*optarg) {
-			subs = strchr(optarg, ',');
+			subs = std::strchr(optarg, ',');
 			if (subs)
 				*subs = 0;
 
diff --git a/utils/v4l2-dbg/v4l2-dbg.cpp b/utils/v4l2-dbg/v4l2-dbg.cpp
index f2fd8269..86266376 100644
--- a/utils/v4l2-dbg/v4l2-dbg.cpp
+++ b/utils/v4l2-dbg/v4l2-dbg.cpp
@@ -19,7 +19,6 @@ 
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -43,6 +42,7 @@ 
 
 #include <linux/videodev2.h>
 
+#include <cstring>
 #include <list>
 #include <vector>
 #include <map>
@@ -731,7 +731,7 @@  int main(int argc, char **argv)
 			goto list_done;
 		}
 
-		p = strchr(chip_info.name, ' ');
+		p = std::strchr(chip_info.name, ' ');
 		if (p)
 			*p = '\0';
 		name = chip_info.name;

[1/7] utils: replace strchr with std variant

Commit Message

Comments

Patch