utils: replace chr functions with std variants
PATCH 1/3 utils: replace chr functions with std variants
*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(-)
utils/cec-compliance/cec-test.cpp +3 -2
@@ -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;
utils/cec-ctl/cec-ctl.cpp +8 -7
@@ -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++;
utils/cec-follower/cec-follower.cpp +3 -2
@@ -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)
utils/libcecutil/cec-parse.cpp +2 -2
@@ -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");
utils/v4l2-compliance/v4l2-compliance.cpp +3 -2
@@ -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)
utils/v4l2-ctl/v4l2-ctl-common.cpp +5 -5
@@ -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 {
utils/v4l2-ctl/v4l2-ctl-edid.cpp +3 -2
@@ -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");
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +4 -3
@@ -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;
utils/v4l2-ctl/v4l2-ctl-vbi.cpp +3 -2
@@ -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;
utils/v4l2-dbg/v4l2-dbg.cpp +2 -2
@@ -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;
Signature · 1 line
2.26.2
PATCH 2/3 utils: switch strstr to std variant
strstr has const overloads in std, avoiding pointless conversions.
--- 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(-)
utils/libcecutil/cec-log.cpp +1 -1
@@ -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);
utils/v4l2-ctl/v4l2-ctl-common.cpp +2 -2
@@ -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);
utils/v4l2-ctl/v4l2-ctl-misc.cpp +3 -3
@@ -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:
utils/v4l2-dbg/v4l2-dbg.cpp +2 -2
@@ -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);
Signature · 1 line
2.26.2
Re: [PATCH 2/3] utils: switch strstr to std variant
Quoted 3 lines · Rosen Penev
strstr has const overloads in std, avoiding pointless conversions.
Signed-off-by Rosen Penev <[email protected]>
This introduces a compile error:
v4l2-ctl-misc.cpp: In function ‘void misc_cmd(int, char*)’:
v4l2-ctl-misc.cpp:215:14: error: ‘strstr’ is not a member of ‘std’; did you mean ‘strstr’?
215 | if (std::strstr(value, "dht"))
| ^~~~~~
In file included from v4l2-ctl-misc.cpp:4:
/usr/include/string.h:323:1: note: ‘strstr’ declared here
323 | strstr (const char *__haystack, const char *__needle) __THROW
| ^~~~~~
v4l2-ctl-misc.cpp:217:14: error: ‘strstr’ is not a member of ‘std’; did you mean ‘strstr’?
217 | if (std::strstr(value, "dqt"))
| ^~~~~~
In file included from v4l2-ctl-misc.cpp:4:
/usr/include/string.h:323:1: note: ‘strstr’ declared here
323 | strstr (const char *__haystack, const char *__needle) __THROW
| ^~~~~~
v4l2-ctl-misc.cpp:219:14: error: ‘strstr’ is not a member of ‘std’; did you mean ‘strstr’?
219 | if (std::strstr(value, "dri"))
| ^~~~~~
In file included from v4l2-ctl-misc.cpp:4:
/usr/include/string.h:323:1: note: ‘strstr’ declared here
323 | strstr (const char *__haystack, const char *__needle) __THROW
| ^~~~~~Probably a missing header.
Regards,
Hans
Quoted 81 lines
--- 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(-)utils/libcecutil/cec-log.cpp +1
-1@@ -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);utils/v4l2-ctl/v4l2-ctl-common.cpp +2
-2@@ -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);utils/v4l2-ctl/v4l2-ctl-misc.cpp +3
-3@@ -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:utils/v4l2-dbg/v4l2-dbg.cpp +2
-2@@ -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);
Re: [PATCH 2/3] utils: switch strstr to std variant
Quoted 31 lines · Hans Verkuil
Quoted 3 lines · Rosen Penev
strstr has const overloads in std, avoiding pointless conversions.
Signed-off-by Rosen Penev <[email protected]>This introduces a compile error:
v4l2-ctl-misc.cpp: In function ‘void
misc_cmd(int, char*)’:
v4l2-ctl-misc.cpp:215:14: error: ‘strstr’ is not a member of ‘std’; did you mean ‘strstr’?
215 | if (std::strstr(value, "dht"))| ^~~~~~ In file included from v4l2-ctl-misc.cpp:4: /usr/include/string.h:323:1: note: ‘strstr’ declared here 323 | strstr (const char *__haystack, const char *__needle) __THROW | ^~~~~~ v4l2-ctl-misc.cpp:217:14: error: ‘strstr’ is not a member of ‘std’; did you mean ‘strstr’? 217 | if (std::strstr(value, "dqt")) | ^~~~~~ In file included from v4l2-ctl-misc.cpp:4: /usr/include/string.h:323:1: note: ‘strstr’ declared here 323 | strstr (const char *__haystack, const char *__needle) __THROW | ^~~~~~ v4l2-ctl-misc.cpp:219:14: error: ‘strstr’ is not a member of ‘std’; did you mean ‘strstr’? 219 | if (std::strstr(value, "dri")) | ^~~~~~ In file included from v4l2-ctl-misc.cpp:4: /usr/include/string.h:323:1: note: ‘strstr’ declared here 323 | strstr (const char *__haystack, const char *__needle) __THROW | ^~~~~~
Quoted 1 line
Probably a missing header.
Fixed by my other patch of course :).
Quoted 87 lines
Regards,
Hans
Quoted 81 lines
--- 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(-)utils/libcecutil/cec-log.cpp +1
-1@@ -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);utils/v4l2-ctl/v4l2-ctl-common.cpp +2
-2@@ -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);utils/v4l2-ctl/v4l2-ctl-misc.cpp +3
-3@@ -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:utils/v4l2-dbg/v4l2-dbg.cpp +2
-2@@ -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);
PATCH 3/3 utils: switch C to C++ headers
In reply to Rosen PenevRecently, 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.
--- 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(-)
utils/cec-compliance/cec-compliance.cpp +5 -5
@@ -4,17 +4,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>
utils/cec-compliance/cec-test-adapter.cpp +5 -5
@@ -4,16 +4,16 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>
utils/cec-compliance/cec-test-audio.cpp +5 -5
@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>
utils/cec-compliance/cec-test-fuzzing.cpp +5 -5
@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h> #include <sstream>
utils/cec-compliance/cec-test-power.cpp +5 -5
@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>
utils/cec-compliance/cec-test.cpp +4 -4
@@ -6,14 +6,14 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h> #include <sstream>
utils/cec-ctl/cec-ctl.cpp +5 -5
@@ -6,8 +6,8 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>
@@ -15,10 +15,10 @@ #include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <ctime> #include <cerrno> #include <string>
utils/cec-ctl/cec-pin.cpp +6 -6
@@ -4,19 +4,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <cerrno> #include <string> #include <vector>
utils/cec-follower/cec-follower.cpp +4 -4
@@ -6,15 +6,15 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>
utils/cec-follower/cec-processing.cpp +5 -5
@@ -4,16 +4,16 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>
utils/cec-follower/cec-tuner.cpp +1 -1
@@ -4,7 +4,7 @@ */ #include <sys/ioctl.h> -#include <stdlib.h> +#include <cstdlib> #include "cec-follower.h" #include "compiler.h"
utils/common/media-info.cpp +5 -5
@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h>
utils/common/v4l2-info.cpp +5 -5
@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h>
utils/libcecutil/cec-info.cpp +1 -1
@@ -5,7 +5,7 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <stdio.h> +#include <cstdio> #include <string> #include <unistd.h> #include <fcntl.h>
utils/libcecutil/cec-log.cpp +4 -4
@@ -4,11 +4,11 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> -#include <stdarg.h> +#include <cstdarg> #include <string> #include <linux/cec-funcs.h> #include "cec-htng-funcs.h"
utils/libcecutil/cec-parse.cpp +5 -5
@@ -4,8 +4,8 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>
@@ -13,10 +13,10 @@ #include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <cstring> #include <ctime> #include <cerrno>
utils/rds-ctl/rds-ctl.cpp +7 -7
@@ -8,21 +8,21 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <wchar.h> -#include <locale.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> +#include <cwchar> +#include <clocale> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <fcntl.h> -#include <errno.h> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> #include <config.h> -#include <signal.h> +#include <csignal> #include <linux/videodev2.h> #include <libv4l2rds.h>
utils/v4l2-compliance/v4l2-compliance.cpp +6 -6
@@ -21,22 +21,22 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <sys/utsname.h> -#include <signal.h> +#include <csignal> #include <vector> #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-buffers.cpp +5 -5
@@ -19,9 +19,9 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h>
@@ -29,8 +29,8 @@ #include <sys/wait.h> #include <sys/epoll.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <poll.h> #include <sys/ioctl.h> #include <netinet/in.h>
utils/v4l2-compliance/v4l2-test-codecs.cpp +6 -6
@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "v4l2-compliance.h" int testEncoder(struct node *node)
utils/v4l2-compliance/v4l2-test-colors.cpp +6 -6
@@ -15,19 +15,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #include "compiler.h" #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-controls.cpp +5 -5
@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <vector>
utils/v4l2-compliance/v4l2-test-debug.cpp +6 -6
@@ -19,19 +19,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #include "v4l2-compliance.h" int testRegister(struct node *node)
utils/v4l2-compliance/v4l2-test-formats.cpp +6 -6
@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "compiler.h" #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-input-output.cpp +5 -5
@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-io-config.cpp +5 -5
@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-media.cpp +6 -6
@@ -19,19 +19,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/sysmacros.h> #include <fcntl.h> #include <dirent.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include <set> #include <fstream>
utils/v4l2-compliance/v4l2-test-subdevs.cpp +6 -6
@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "v4l2-compliance.h"
utils/v4l2-ctl/v4l2-ctl-common.cpp +5 -5
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/sysmacros.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-edid.cpp +4 -4
@@ -1,12 +1,12 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-io.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-meta.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-misc.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-modes.cpp +2 -2
@@ -6,8 +6,8 @@ * reserved. */ -#include <stdio.h> -#include <stdbool.h> +#include <cstdio> + #include "v4l2-ctl.h" static bool valid_params(int width, int height, int refresh_rate)
utils/v4l2-ctl/v4l2-ctl-overlay.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/fb.h> #include <vector>
utils/v4l2-ctl/v4l2-ctl-sdr.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-selection.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-stds.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +5 -5
@@ -1,8 +1,8 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>
@@ -11,13 +11,13 @@ #include <netinet/in.h> #include <netdb.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/mman.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h> #include "compiler.h"
utils/v4l2-ctl/v4l2-ctl-subdev.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-tuner.cpp +5 -5
@@ -1,14 +1,14 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h>
utils/v4l2-ctl/v4l2-ctl-vbi.cpp +5 -5
@@ -1,19 +1,19 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "compiler.h" #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-vidcap.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-vidout.cpp +6 -6
@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl.cpp +6 -6
@@ -21,22 +21,22 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/epoll.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h>
utils/v4l2-dbg/v4l2-dbg.cpp +5 -5
@@ -17,18 +17,18 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #ifdef ANDROID #include <android-config.h>
Signature · 1 line
2.26.2
Re: [PATCH 3/3] utils: switch C to C++ headers
Quoted 5 lines · Rosen Penev
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.
What build failure? Can you show what the error is? And which older platforms?
I'd really like to know what the precise problem is that this patch fixes.
I'll merge patches 1 and 2, but not this one. I need a better and more detailed commit log message.
Regards,
Hans
Quoted 1,280 lines
Signed-off-by Rosen Penev <[email protected]>--- 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(-)utils/cec-compliance/cec-compliance.cpp +5
-5@@ -4,17 +4,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>utils/cec-compliance/cec-test-adapter.cpp +5
-5@@ -4,16 +4,16 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>utils/cec-compliance/cec-test-audio.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>utils/cec-compliance/cec-test-fuzzing.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h> #include <sstream>utils/cec-compliance/cec-test-power.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>utils/cec-compliance/cec-test.cpp +4
-4@@ -6,14 +6,14 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h> #include <sstream>utils/cec-ctl/cec-ctl.cpp +5
-5@@ -6,8 +6,8 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>@@ -15,10 +15,10 @@ #include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <ctime> #include <cerrno> #include <string>utils/cec-ctl/cec-pin.cpp +6
-6@@ -4,19 +4,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <cerrno> #include <string> #include <vector>utils/cec-follower/cec-follower.cpp +4
-4@@ -6,15 +6,15 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>utils/cec-follower/cec-processing.cpp +5
-5@@ -4,16 +4,16 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>utils/cec-follower/cec-tuner.cpp +1
-1@@ -4,7 +4,7 @@ */ #include <sys/ioctl.h> -#include <stdlib.h> +#include <cstdlib> #include "cec-follower.h" #include "compiler.h"utils/common/media-info.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h>utils/common/v4l2-info.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h>utils/libcecutil/cec-info.cpp +1
-1@@ -5,7 +5,7 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <stdio.h> +#include <cstdio> #include <string> #include <unistd.h> #include <fcntl.h>utils/libcecutil/cec-log.cpp +4
-4@@ -4,11 +4,11 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> -#include <stdarg.h> +#include <cstdarg> #include <string> #include <linux/cec-funcs.h> #include "cec-htng-funcs.h"utils/libcecutil/cec-parse.cpp +5
-5@@ -4,8 +4,8 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>@@ -13,10 +13,10 @@ #include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <cstring> #include <ctime> #include <cerrno>utils/rds-ctl/rds-ctl.cpp +7
-7@@ -8,21 +8,21 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <wchar.h> -#include <locale.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> +#include <cwchar> +#include <clocale> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <fcntl.h> -#include <errno.h> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> #include <config.h> -#include <signal.h> +#include <csignal> #include <linux/videodev2.h> #include <libv4l2rds.h>utils/v4l2-compliance/v4l2-compliance.cpp +6
-6@@ -21,22 +21,22 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <sys/utsname.h> -#include <signal.h> +#include <csignal> #include <vector> #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-buffers.cpp +5
-5@@ -19,9 +19,9 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h>@@ -29,8 +29,8 @@ #include <sys/wait.h> #include <sys/epoll.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <poll.h> #include <sys/ioctl.h> #include <netinet/in.h>utils/v4l2-compliance/v4l2-test-codecs.cpp +6
-6@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "v4l2-compliance.h" int testEncoder(struct node *node)utils/v4l2-compliance/v4l2-test-colors.cpp +6
-6@@ -15,19 +15,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #include "compiler.h" #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-controls.cpp +5
-5@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <vector>utils/v4l2-compliance/v4l2-test-debug.cpp +6
-6@@ -19,19 +19,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #include "v4l2-compliance.h" int testRegister(struct node *node)utils/v4l2-compliance/v4l2-test-formats.cpp +6
-6@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "compiler.h" #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-input-output.cpp +5
-5@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-io-config.cpp +5
-5@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-media.cpp +6
-6@@ -19,19 +19,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/sysmacros.h> #include <fcntl.h> #include <dirent.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include <set> #include <fstream>utils/v4l2-compliance/v4l2-test-subdevs.cpp +6
-6@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "v4l2-compliance.h"utils/v4l2-ctl/v4l2-ctl-common.cpp +5
-5@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/sysmacros.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-edid.cpp +4
-4@@ -1,12 +1,12 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-io.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-meta.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-misc.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-modes.cpp +2
-2@@ -6,8 +6,8 @@ * reserved. */ -#include <stdio.h> -#include <stdbool.h> +#include <cstdio> + #include "v4l2-ctl.h" static bool valid_params(int width, int height, int refresh_rate)utils/v4l2-ctl/v4l2-ctl-overlay.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/fb.h> #include <vector>utils/v4l2-ctl/v4l2-ctl-sdr.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-selection.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-stds.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-streaming.cpp +5
-5@@ -1,8 +1,8 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>@@ -11,13 +11,13 @@ #include <netinet/in.h> #include <netdb.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/mman.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h> #include "compiler.h"utils/v4l2-ctl/v4l2-ctl-subdev.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-tuner.cpp +5
-5@@ -1,14 +1,14 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h>utils/v4l2-ctl/v4l2-ctl-vbi.cpp +5
-5@@ -1,19 +1,19 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "compiler.h" #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-vidcap.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-vidout.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl.cpp +6
-6@@ -21,22 +21,22 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/epoll.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h>utils/v4l2-dbg/v4l2-dbg.cpp +5
-5@@ -17,18 +17,18 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #ifdef ANDROID #include <android-config.h>
Re: [PATCH 3/3] utils: switch C to C++ headers
Quoted 10 lines · Hans Verkuil
Quoted 5 lines · Rosen Penev
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.
What build failure? Can you show what the error is? And which older platforms?
I actually cannot build this anymore. I'm getting some weird syscall errors:
../lib/libv4l2/../libv4lconvert/libv4lsyscall-priv.h:116:10: error:
‘SYS_mmap2’ undeclared (first use in this function)
116 | syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
| ^~~~~~~~~../lib/libv4l2/libv4l2.c:112:44: note: in expansion of macro ‘SYS_MMAP’
112 | devices[index].convert_mmap_buf = (void *)SYS_MMAP(NULL,
| ^~~~~~~~../lib/libv4l2/../libv4lconvert/libv4lsyscall-priv.h:116:10: note:
each undeclared identifier is reported only once for each function it appears in
116 | syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
| ^~~~~~~~~../lib/libv4l2/libv4l2.c:112:44: note: in expansion of macro ‘SYS_MMAP’
112 | devices[index].convert_mmap_buf = (void *)SYS_MMAP(NULL,
| ^~~~~~~~../lib/libv4l2/../libv4lconvert/libv4lsyscall-priv.h:117:59: error:
‘MMAP2_PAGE_SHIFT’ undeclared (first use in this function); did you mean ‘MAP_HUGE_SHIFT’?
117 | (int)(prot), (int)(flags), (int)(fd), (off_t)((off) >>MMAP2_PAGE_SHIFT))
|
^~~~~~~~~~~~~~~~../lib/libv4l2/libv4l2.c:112:44: note: in expansion of macro ‘SYS_MMAP’
112 | devices[index].convert_mmap_buf = (void *)SYS_MMAP(NULL,
| ^~~~~~~~../lib/libv4l2/libv4l2.c: In function ‘v4l2_map_buffers’:../lib/libv4l2/../libv4lconvert/libv4lsyscall-priv.h:116:10: error:
‘SYS_mmap2’ undeclared (first use in this function)
116 | syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
Some other patch broke this I guess. This is on Fedora 32.
Quoted 1,293 lines
I'd really like to know what the precise problem is that this patch fixes.
I'll merge patches 1 and 2, but not this one. I need a better and more detailed commit log message.
Regards,
Hans
Quoted 1,280 lines
Signed-off-by Rosen Penev <[email protected]>--- 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(-)utils/cec-compliance/cec-compliance.cpp +5
-5@@ -4,17 +4,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>utils/cec-compliance/cec-test-adapter.cpp +5
-5@@ -4,16 +4,16 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>utils/cec-compliance/cec-test-audio.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>utils/cec-compliance/cec-test-fuzzing.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h> #include <sstream>utils/cec-compliance/cec-test-power.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>utils/cec-compliance/cec-test.cpp +4
-4@@ -6,14 +6,14 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h> #include <sstream>utils/cec-ctl/cec-ctl.cpp +5
-5@@ -6,8 +6,8 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>@@ -15,10 +15,10 @@ #include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <ctime> #include <cerrno> #include <string>utils/cec-ctl/cec-pin.cpp +6
-6@@ -4,19 +4,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <cerrno> #include <string> #include <vector>utils/cec-follower/cec-follower.cpp +4
-4@@ -6,15 +6,15 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/wait.h> #include <sstream>utils/cec-follower/cec-processing.cpp +5
-5@@ -4,16 +4,16 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <config.h>utils/cec-follower/cec-tuner.cpp +1
-1@@ -4,7 +4,7 @@ */ #include <sys/ioctl.h> -#include <stdlib.h> +#include <cstdlib> #include "cec-follower.h" #include "compiler.h"utils/common/media-info.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h>utils/common/v4l2-info.cpp +5
-5@@ -4,15 +4,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h>utils/libcecutil/cec-info.cpp +1
-1@@ -5,7 +5,7 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <stdio.h> +#include <cstdio> #include <string> #include <unistd.h> #include <fcntl.h>utils/libcecutil/cec-log.cpp +4
-4@@ -4,11 +4,11 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> -#include <stdarg.h> +#include <cstdarg> #include <string> #include <linux/cec-funcs.h> #include "cec-htng-funcs.h"utils/libcecutil/cec-parse.cpp +5
-5@@ -4,8 +4,8 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>@@ -13,10 +13,10 @@ #include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <stdarg.h> +#include <cstdarg> #include <cstring> #include <ctime> #include <cerrno>utils/rds-ctl/rds-ctl.cpp +7
-7@@ -8,21 +8,21 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <wchar.h> -#include <locale.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> +#include <cwchar> +#include <clocale> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <fcntl.h> -#include <errno.h> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> #include <config.h> -#include <signal.h> +#include <csignal> #include <linux/videodev2.h> #include <libv4l2rds.h>utils/v4l2-compliance/v4l2-compliance.cpp +6
-6@@ -21,22 +21,22 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <sys/utsname.h> -#include <signal.h> +#include <csignal> #include <vector> #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-buffers.cpp +5
-5@@ -19,9 +19,9 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h>@@ -29,8 +29,8 @@ #include <sys/wait.h> #include <sys/epoll.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <poll.h> #include <sys/ioctl.h> #include <netinet/in.h>utils/v4l2-compliance/v4l2-test-codecs.cpp +6
-6@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "v4l2-compliance.h" int testEncoder(struct node *node)utils/v4l2-compliance/v4l2-test-colors.cpp +6
-6@@ -15,19 +15,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #include "compiler.h" #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-controls.cpp +5
-5@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <vector>utils/v4l2-compliance/v4l2-test-debug.cpp +6
-6@@ -19,19 +19,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #include "v4l2-compliance.h" int testRegister(struct node *node)utils/v4l2-compliance/v4l2-test-formats.cpp +6
-6@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "compiler.h" #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-input-output.cpp +5
-5@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-io-config.cpp +5
-5@@ -19,15 +19,15 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-compliance.h"utils/v4l2-compliance/v4l2-test-media.cpp +6
-6@@ -19,19 +19,19 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/sysmacros.h> #include <fcntl.h> #include <dirent.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include <set> #include <fstream>utils/v4l2-compliance/v4l2-test-subdevs.cpp +6
-6@@ -19,17 +19,17 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> -#include <assert.h> +#include <cassert> #include "v4l2-compliance.h"utils/v4l2-ctl/v4l2-ctl-common.cpp +5
-5@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/sysmacros.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-edid.cpp +4
-4@@ -1,12 +1,12 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-io.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-meta.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-misc.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-modes.cpp +2
-2@@ -6,8 +6,8 @@ * reserved. */ -#include <stdio.h> -#include <stdbool.h> +#include <cstdio> + #include "v4l2-ctl.h" static bool valid_params(int width, int height, int refresh_rate)utils/v4l2-ctl/v4l2-ctl-overlay.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/fb.h> #include <vector>utils/v4l2-ctl/v4l2-ctl-sdr.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-selection.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-stds.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-streaming.cpp +5
-5@@ -1,8 +1,8 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h>@@ -11,13 +11,13 @@ #include <netinet/in.h> #include <netdb.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/mman.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h> #include "compiler.h"utils/v4l2-ctl/v4l2-ctl-subdev.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-tuner.cpp +5
-5@@ -1,14 +1,14 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h>utils/v4l2-ctl/v4l2-ctl-vbi.cpp +5
-5@@ -1,19 +1,19 @@ #include <cstring> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "compiler.h" #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-vidcap.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl-vidout.cpp +6
-6@@ -1,18 +1,18 @@ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include "v4l2-ctl.h"utils/v4l2-ctl/v4l2-ctl.cpp +6
-6@@ -21,22 +21,22 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/epoll.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> #include <sys/sysmacros.h> #include <dirent.h> -#include <math.h> +#include <cmath> #include <linux/media.h>utils/v4l2-dbg/v4l2-dbg.cpp +5
-5@@ -17,18 +17,18 @@ */ #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> #include <inttypes.h> #include <getopt.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cctype> +#include <cerrno> #include <sys/ioctl.h> #include <sys/time.h> -#include <math.h> +#include <cmath> #ifdef ANDROID #include <android-config.h>