From: Rosen Penev <rosenp@gmail.com>
To: linux-media@vger.kernel.org
Subject: [PATCH 1/3] utils: replace chr functions with std variants
Date: Sun, 10 May 2020 18:25:47 -0700 [thread overview]
Message-ID: <20200511012549.1145814-1-rosenp@gmail.com> (raw)
*chr in std offers const overloads, which avoid conversions.
---
utils/cec-compliance/cec-test.cpp | 5 +++--
utils/cec-ctl/cec-ctl.cpp | 15 ++++++++-------
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 | 10 +++++-----
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, 36 insertions(+), 29 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..899b83b1 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>
@@ -1650,7 +1651,7 @@ static void stress_test_power_cycle(struct node &node, unsigned cnt,
static int calc_node_val(const char *s)
{
- s = strrchr(s, '/') + 1;
+ s = std::strrchr(s, '/') + 1;
if (!memcmp(s, "cec", 3))
return atol(s + 3);
@@ -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 676b9278..549e37f7 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>
@@ -1582,7 +1583,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..47f5da1a 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>
@@ -152,7 +152,7 @@ static int calc_node_val(const char *s)
{
int n = 0;
- s = strrchr(s, '/') + 1;
+ s = std::strrchr(s, '/') + 1;
for (unsigned i = 0; prefixes[i]; i++) {
unsigned l = strlen(prefixes[i]);
@@ -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 0d5a1e1a..8578610d 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;
--
2.26.2
next reply other threads:[~2020-05-11 1:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 1:25 Rosen Penev [this message]
2020-05-11 1:25 ` [PATCH 2/3] utils: switch strstr to std variant Rosen Penev
2020-05-11 7:23 ` Hans Verkuil
2020-05-12 6:00 ` Rosen Penev
2020-05-11 1:25 ` [PATCH 3/3] utils: switch C to C++ headers Rosen Penev
2020-05-11 7:21 ` Hans Verkuil
2020-05-12 20:51 ` Rosen Penev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200511012549.1145814-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.