clean up includes and convert C includes to C++
PATCH 1/1 clean up includes and convert C includes to C++
Several C includes ending in .h are deprecated in C++.
Tested with several combinations of uClibc-ng, musl, glibc, libstdcpp, libcxx, and uClibc++.
Signed-off-by Rosen Penev <[email protected]>
--- utils/cec-compliance/cec-compliance.cpp | 19 +++------- utils/cec-compliance/cec-compliance.h | 4 -- utils/cec-compliance/cec-test-adapter.cpp | 19 +++------- utils/cec-compliance/cec-test-audio.cpp | 17 ++------- utils/cec-compliance/cec-test-fuzzing.cpp | 15 ++------ utils/cec-compliance/cec-test-power.cpp | 16 +++----- utils/cec-compliance/cec-test.cpp | 18 ++------- utils/cec-ctl/cec-ctl.cpp | 28 ++++++-------- utils/cec-ctl/cec-pin.cpp | 18 +-------- utils/cec-follower/cec-follower.cpp | 15 ++------ utils/cec-follower/cec-follower.h | 4 -- utils/cec-follower/cec-processing.cpp | 17 +++------ utils/cec-follower/cec-tuner.cpp | 4 +- utils/common/media-info.cpp | 21 ++++------- utils/common/v4l2-info.cpp | 17 --------- utils/common/v4l2-info.h | 1 + utils/libcecutil/cec-info.cpp | 8 ++-- utils/libcecutil/cec-log.cpp | 10 ++--- utils/libcecutil/cec-parse.cpp | 23 ++---------- utils/rds-ctl/rds-ctl.cpp | 37 +++++++------------ utils/v4l2-compliance/v4l2-compliance.cpp | 24 ++++-------- utils/v4l2-compliance/v4l2-compliance.h | 7 ---- utils/v4l2-compliance/v4l2-test-buffers.cpp | 26 ++++--------- utils/v4l2-compliance/v4l2-test-codecs.cpp | 15 ++------ utils/v4l2-compliance/v4l2-test-colors.cpp | 17 ++------- utils/v4l2-compliance/v4l2-test-controls.cpp | 15 ++------ utils/v4l2-compliance/v4l2-test-debug.cpp | 17 ++------- utils/v4l2-compliance/v4l2-test-formats.cpp | 15 ++------ .../v4l2-test-input-output.cpp | 16 +++----- utils/v4l2-compliance/v4l2-test-io-config.cpp | 14 ++----- utils/v4l2-compliance/v4l2-test-media.cpp | 20 +++------- utils/v4l2-compliance/v4l2-test-subdevs.cpp | 14 ++----- utils/v4l2-ctl/v4l2-ctl-common.cpp | 28 +++++--------- utils/v4l2-ctl/v4l2-ctl-edid.cpp | 13 +------ utils/v4l2-ctl/v4l2-ctl-io.cpp | 16 -------- utils/v4l2-ctl/v4l2-ctl-meta.cpp | 17 +-------- utils/v4l2-ctl/v4l2-ctl-misc.cpp | 17 --------- utils/v4l2-ctl/v4l2-ctl-modes.cpp | 2 - utils/v4l2-ctl/v4l2-ctl-overlay.cpp | 17 +-------- utils/v4l2-ctl/v4l2-ctl-sdr.cpp | 17 --------- utils/v4l2-ctl/v4l2-ctl-selection.cpp | 17 --------- utils/v4l2-ctl/v4l2-ctl-stds.cpp | 17 +-------- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 21 +---------- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 17 --------- utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 15 -------- utils/v4l2-ctl/v4l2-ctl-vbi.cpp | 16 -------- utils/v4l2-ctl/v4l2-ctl-vidcap.cpp | 19 ++-------- utils/v4l2-ctl/v4l2-ctl-vidout.cpp | 17 --------- utils/v4l2-ctl/v4l2-ctl.cpp | 24 ++---------- utils/v4l2-ctl/v4l2-ctl.h | 2 - utils/v4l2-dbg/v4l2-dbg.cpp | 26 ++++--------- 51 files changed, 167 insertions(+), 662 deletions(-)
utils/cec-compliance/cec-compliance.cpp +5 -14
@@ -3,22 +3,13 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> +#include <sstream> + #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <getopt.h> #include <sys/ioctl.h> -#include <sys/wait.h> -#include <sstream> -#include <cstdlib> +#include <sys/time.h> +#include <unistd.h> #include "cec-compliance.h" #include "compiler.h"
utils/cec-compliance/cec-compliance.h +0 -4
@@ -8,10 +8,6 @@#ifndef _CEC_COMPLIANCE_H_#define _CEC_COMPLIANCE_H_ -#include <cstdlib> -#include <ctime> -#include <string> -#include <linux/cec-funcs.h> #include "cec-htng-funcs.h"
utils/cec-compliance/cec-test-adapter.cpp +6 -13
@@ -3,21 +3,14 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> +#include <cerrno> +#include <ctime> +#include <string> + #include <fcntl.h> -#include <ctype.h> -#include <errno.h> #include <sys/ioctl.h> -#include <sys/wait.h> -#include <sstream> -#include <cstdlib> +#include <sys/select.h> +#include <unistd.h> #include "cec-compliance.h"
utils/cec-compliance/cec-test-audio.cpp +4 -13
@@ -3,23 +3,14 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <ctime> +#include <string> + #include <sys/ioctl.h> -#include <config.h> -#include <cstdlib> +#include <unistd.h> #include "cec-compliance.h" - /* Dynamic Auto Lipsync */ static int dal_request_current_latency(struct node *node, unsigned me, unsigned la, bool interactive)
utils/cec-compliance/cec-test-fuzzing.cpp +3 -12
@@ -3,19 +3,10 @@ * Copyright 2019 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <ctime> +#include <string> + #include <sys/ioctl.h> -#include <config.h> -#include <sstream> #include "cec-compliance.h"
utils/cec-compliance/cec-test-power.cpp +5 -11
@@ -3,18 +3,12 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <cerrno> +#include <ctime> +#include <string> + #include <sys/ioctl.h> -#include <config.h> +#include <unistd.h> #include "cec-compliance.h"
utils/cec-compliance/cec-test.cpp +4 -14
@@ -3,23 +3,13 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <cstdlib> #include <cstring> - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <config.h> +#include <map> #include <sstream> #include <vector> -#include <map> + +#include <sys/ioctl.h> +#include <unistd.h> #include "cec-compliance.h"
utils/cec-ctl/cec-ctl.cpp +11 -17
@@ -3,28 +3,22 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ +#include <algorithm> +#include <cctype> +#include <cerrno> #include <cstring> +#include <ctime> +#include <map> +#include <string> +#include <vector> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> #include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <getopt.h> #include <sys/ioctl.h> -#include <stdarg.h> -#include <ctime> -#include <cerrno> -#include <string> -#include <vector> -#include <map> -#include <algorithm> +#include <sys/time.h> +#include <unistd.h> + #include <linux/cec-funcs.h> #include "cec-htng-funcs.h" #include "cec-log.h"
utils/cec-ctl/cec-pin.cpp +1 -17
@@ -3,24 +3,8 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#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 <sys/ioctl.h> -#include <stdarg.h> -#include <cerrno> #include <string> -#include <vector> -#include <algorithm> + #include <linux/cec.h> #include "cec-htng.h"
utils/cec-follower/cec-follower.cpp +3 -12
@@ -3,22 +3,13 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <cstdlib> #include <cstring> +#include <ctime> +#include <sstream> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <getopt.h> #include <sys/ioctl.h> -#include <sys/wait.h> -#include <sstream> #include "cec-follower.h" #include "compiler.h"
utils/cec-follower/cec-follower.h +0 -4
@@ -8,10 +8,6 @@#ifndef _CEC_FOLLOWER_H_#define _CEC_FOLLOWER_H_ -#include <stdarg.h> -#include <ctime> -#include <cerrno> -#include <string> #include <linux/cec-funcs.h> #include "cec-htng-funcs.h"
utils/cec-follower/cec-processing.cpp +5 -12
@@ -3,19 +3,12 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#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 <cerrno> +#include <ctime> +#include <string> + #include <sys/ioctl.h> -#include <config.h> +#include <sys/time.h> #include "cec-follower.h" #include "compiler.h"
utils/cec-follower/cec-tuner.cpp +3 -1
@@ -3,8 +3,10 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ +#include <ctime> +#include <string> + #include <sys/ioctl.h> -#include <stdlib.h> #include "cec-follower.h" #include "compiler.h"
utils/common/media-info.cpp +7 -14
@@ -3,26 +3,19 @@ * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> +#include <cstring> +#include <fstream> +#include <iostream> + +#include <dirent.h> #include <fcntl.h> -#include <ctype.h> -#include <errno.h> #include <sys/ioctl.h> -#include <sys/time.h> +#include <sys/stat.h> #include <sys/sysmacros.h> -#include <dirent.h> -#include <cstdlib> +#include <unistd.h> #include <linux/media.h> -#include <iostream> -#include <fstream> #include <media-info.h> static std::string num2s(unsigned num, bool is_hex = true)
utils/common/v4l2-info.cpp +0 -17
@@ -3,25 +3,8 @@ * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <sys/sysmacros.h> -#include <dirent.h> - #include <v4l2-info.h> -#include <fstream> - static std::string num2s(unsigned num, bool is_hex = true) { char buf[16];
utils/common/v4l2-info.h +1 -0
@@ -7,6 +7,7 @@#define _V4L2_INFO_H#include <string> +#include <linux/videodev2.h> /* Print capability information */
utils/libcecutil/cec-info.cpp +5 -3
@@ -5,12 +5,14 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <stdio.h> +#include <cctype> #include <string> -#include <unistd.h> -#include <fcntl.h> + #include <dirent.h> +#include <fcntl.h> #include <sys/ioctl.h> +#include <unistd.h> + #include <cec-info.h> #include <cec-htng.h>
utils/libcecutil/cec-log.cpp +4 -6
@@ -3,14 +3,12 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <stdarg.h> #include <string> + +#include <unistd.h> + #include <linux/cec-funcs.h> + #include "cec-htng-funcs.h" #include "cec-info.h" #include "cec-log.h"
utils/libcecutil/cec-parse.cpp +4 -19
@@ -3,27 +3,12 @@ * Copyright 2019 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> -#include <dirent.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <stdarg.h> +#include <cctype> #include <cstring> -#include <ctime> -#include <cerrno> #include <string> -#include <vector> -#include <map> -#include <algorithm> + +#include <unistd.h> + #include <linux/cec-funcs.h> #include "cec-htng-funcs.h" #include "cec-log.h"
utils/rds-ctl/rds-ctl.cpp +14 -23
@@ -7,34 +7,25 @@ * Author: Konke Radlow <[email protected]> */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <wchar.h> -#include <locale.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <fcntl.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <config.h> -#include <signal.h> - -#include <linux/videodev2.h> -#include <libv4l2rds.h> - #include <cctype> +#include <cerrno> +#include <clocale> #include <cmath> +#include <csignal> +#include <cstring> #include <ctime> -#include <list> -#include <vector> #include <map> #include <string> -#include <algorithm> +#include <vector> + +#include <dirent.h> +#include <fcntl.h> +#include <getopt.h> +#include <sys/ioctl.h> +#include <unistd.h> + +#include <linux/videodev2.h> +#include <libv4l2rds.h> #define ARRAY_SIZE(arr) ((int)(sizeof(arr) / sizeof((arr)[0])))
utils/v4l2-compliance/v4l2-compliance.cpp +7 -17
@@ -18,27 +18,17 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <cstdlib> +#include <cctype> +#include <csignal> #include <cstring> +#include <map> +#include <set> +#include <vector> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> +#include <dirent.h> #include <getopt.h> #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <sys/sysmacros.h> -#include <dirent.h> -#include <math.h> -#include <sys/utsname.h> -#include <signal.h> -#include <vector> +#include <unistd.h> #include "v4l2-compliance.h" #include <media-info.h>
utils/v4l2-compliance/v4l2-compliance.h +0 -7
@@ -21,13 +21,6 @@#ifndef _V4L2_COMPLIANCE_H_#define _V4L2_COMPLIANCE_H_ -#include <stdarg.h> -#include <cerrno> -#include <cstdlib> -#include <string> -#include <map> -#include <set> -#include <map> #include <linux/videodev2.h> #include <linux/v4l2-subdev.h> #include <linux/media.h>
utils/v4l2-compliance/v4l2-test-buffers.cpp +8 -18
@@ -18,28 +18,18 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/mman.h> -#include <sys/wait.h> -#include <sys/epoll.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <poll.h> -#include <pthread.h> -#include <signal.h> -#include <sys/ioctl.h> -#include <netinet/in.h> #include <algorithm> #include <atomic> +#include <csignal> #include <map> +#include <set> #include <vector> + +#include <arpa/inet.h> +#include <poll.h> +#include <pthread.h> +#include <sys/epoll.h> + #include "v4l2-compliance.h" #define V4L2_CTRL_CLASS_VIVID 0x00f00000
utils/v4l2-compliance/v4l2-test-codecs.cpp +4 -11
@@ -18,18 +18,11 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> +#include <map> +#include <set> + #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <assert.h> + #include "v4l2-compliance.h" int testEncoder(struct node *node)
utils/v4l2-compliance/v4l2-test-colors.cpp +4 -13
@@ -14,20 +14,11 @@ GNU General Public License for more details. */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> +#include <cstdio> +#include <map> +#include <set> + #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <math.h> #include "compiler.h" #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-controls.cpp +4 -11
@@ -18,19 +18,12 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> +#include <map> +#include <set> #include <vector> +#include <sys/types.h> + #include "compiler.h" #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-debug.cpp +4 -13
@@ -18,20 +18,11 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> +#include <map> +#include <set> + #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <math.h> + #include "v4l2-compliance.h" int testRegister(struct node *node)
utils/v4l2-compliance/v4l2-test-formats.cpp +4 -11
@@ -18,18 +18,11 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> +#include <cassert> +#include <map> +#include <set> + #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <assert.h> #include "compiler.h" #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-input-output.cpp +5 -11
@@ -18,18 +18,12 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> +#include <map> +#include <set> #include <vector> + +#include <sys/types.h> + #include "v4l2-compliance.h" #define MAGIC 0x1eadbeef
utils/v4l2-compliance/v4l2-test-io-config.cpp +4 -10
@@ -18,17 +18,11 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> +#include <map> +#include <set> + #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> + #include "v4l2-compliance.h" static int checkStd(struct node *node, bool has_std, v4l2_std_id mask, bool is_input)
utils/v4l2-compliance/v4l2-test-media.cpp +5 -15
@@ -18,22 +18,12 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#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 <sys/ioctl.h> -#include <assert.h> +#include <map> #include <set> -#include <fstream> + +#include <dirent.h> +#include <sys/sysmacros.h> +#include <sys/types.h> #include "v4l2-compliance.h"
utils/v4l2-compliance/v4l2-test-subdevs.cpp +3 -11
@@ -18,18 +18,10 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> +#include <map> +#include <set> + #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <assert.h> #include "v4l2-compliance.h"
utils/v4l2-ctl/v4l2-ctl-common.cpp +9 -19
@@ -1,18 +1,14 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> +#include <algorithm> +#include <cctype> +#include <cstring> +#include <list> +#include <map> +#include <vector> + +#include <dirent.h> #include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> #include <sys/sysmacros.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> + #include <linux/media.h> #include "v4l2-ctl.h"
@@ -21,12 +17,6 @@ #include <sys/klog.h> #endif -#include <cstring> -#include <list> -#include <vector> -#include <map> -#include <algorithm> - struct ctrl_subset { unsigned offset[V4L2_CTRL_MAX_DIMS]; unsigned size[V4L2_CTRL_MAX_DIMS];
utils/v4l2-ctl/v4l2-ctl-edid.cpp +2 -11
@@ -1,19 +1,10 @@ -#include <cstdlib> +#include <cctype> #include <cstring> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> +#include <linux/v4l2-subdev.h> #include "v4l2-ctl.h" -#include <linux/v4l2-subdev.h> - /* * The 24-bit IEEE Registration Identifier for the HDMI-LLC Vendor * Specific Data Block.
utils/v4l2-ctl/v4l2-ctl-io.cpp +0 -16
@@ -1,19 +1,3 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> - #include "v4l2-ctl.h" static struct v4l2_audio vaudio; /* list audio inputs */
utils/v4l2-ctl/v4l2-ctl-meta.cpp +1 -16
@@ -1,19 +1,4 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> +#include <endian.h> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-misc.cpp +0 -17
@@ -1,20 +1,3 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> - #include "v4l2-ctl.h" struct v4l2_decoder_cmd dec_cmd; /* (try_)decoder_cmd */
utils/v4l2-ctl/v4l2-ctl-modes.cpp +0 -2
@@ -6,8 +6,6 @@ * reserved. */ -#include <stdio.h> -#include <stdbool.h> #include "v4l2-ctl.h" static bool valid_params(int width, int height, int refresh_rate)
utils/v4l2-ctl/v4l2-ctl-overlay.cpp +1 -16
@@ -1,21 +1,6 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> +#include <vector> #include <linux/fb.h> -#include <vector> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-sdr.cpp +0 -17
@@ -1,20 +1,3 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> - #include "v4l2-ctl.h" static struct v4l2_format vfmt; /* set_format/get_format */
utils/v4l2-ctl/v4l2-ctl-selection.cpp +0 -17
@@ -1,20 +1,3 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> - #include "v4l2-ctl.h" /* crop specified */
utils/v4l2-ctl/v4l2-ctl-stds.cpp +1 -16
@@ -1,19 +1,4 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> +#include <cctype> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +2 -19
@@ -1,25 +1,8 @@ -#include <algorithm> -#include <cstdlib> #include <cstring> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/socket.h> -#include <netinet/in.h> #include <netdb.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <sys/mman.h> -#include <dirent.h> -#include <math.h> +#include <sys/types.h> + #include <linux/media.h> #include "compiler.h"
utils/v4l2-ctl/v4l2-ctl-subdev.cpp +0 -17
@@ -1,20 +1,3 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> - #include "v4l2-ctl.h" struct mbus_name {
utils/v4l2-ctl/v4l2-ctl-tuner.cpp +0 -15
@@ -1,19 +1,4 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> #include <cmath> -#include <cstdlib> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-vbi.cpp +0 -16
@@ -1,21 +1,5 @@ #include <cstring> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> - #include "compiler.h" #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-vidcap.cpp +3 -16
@@ -1,19 +1,6 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> +#include <cctype> + +#include <endian.h> #include "v4l2-ctl.h"
utils/v4l2-ctl/v4l2-ctl-vidout.cpp +0 -17
@@ -1,20 +1,3 @@ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <ctype.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <sys/time.h> -#include <dirent.h> -#include <math.h> -#include <cstdlib> - #include "v4l2-ctl.h" static unsigned set_fmts_out;
utils/v4l2-ctl/v4l2-ctl.cpp +3 -21
@@ -20,23 +20,11 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> +#include <cctype> + +#include <dirent.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 <sys/ioctl.h> -#include <sys/time.h> -#include <sys/sysmacros.h> -#include <dirent.h> -#include <math.h> #include <linux/media.h>
@@ -48,12 +36,6 @@ #include <sys/klog.h> #endif -#include <list> -#include <vector> -#include <map> -#include <algorithm> -#include <fstream> - char options[OptLast]; static int app_result;
utils/v4l2-ctl/v4l2-ctl.h +0 -2
@@ -7,8 +7,6 @@#include <config.h> #endif -#include <string> -#include <linux/videodev2.h> #include <linux/v4l2-subdev.h>
utils/v4l2-dbg/v4l2-dbg.cpp +8 -18
@@ -16,20 +16,16 @@ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <inttypes.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/stat.h> +#include <cctype> +#include <cerrno> +#include <cstring> +#include <string> +#include <vector> + #include <fcntl.h> -#include <ctype.h> -#include <errno.h> +#include <getopt.h> #include <sys/ioctl.h> -#include <sys/time.h> -#include <math.h> -#include <cstdlib> +#include <unistd.h> #ifdef ANDROID #include <android-config.h>
@@ -43,12 +39,6 @@ #include <linux/videodev2.h> -#include <cstring> -#include <list> -#include <vector> -#include <map> -#include <string> - #include "v4l2-dbg-bttv.h" #include "v4l2-dbg-saa7134.h" #include "v4l2-dbg-em28xx.h"
Signature · 1 line
2.26.2