From 253922fc720f48e98e6bc9030b5c712044ab83fc Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 23 Jul 2008 13:10:10 +0200 Subject: v4l2-apps: fixes for compile warnings/errors From: Hans Verkuil - clean up capture_example.c (bad codingstyle and compile warnings) - fix some headers without trailing newline - fix compile warnings in v4l2-ctl.cpp and v4l2-dbg.cpp - fix qv4l2 __stack_chk_fail_local compile error that occurs on some distros (ubuntu) - fix some Makefile clean up rules Signed-off-by: Hans Verkuil --- v4l2-apps/util/v4l2-dbg.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'v4l2-apps/util/v4l2-dbg.cpp') diff --git a/v4l2-apps/util/v4l2-dbg.cpp b/v4l2-apps/util/v4l2-dbg.cpp index 8323f2120..0ffd9de64 100644 --- a/v4l2-apps/util/v4l2-dbg.cpp +++ b/v4l2-apps/util/v4l2-dbg.cpp @@ -245,9 +245,9 @@ static int doioctl(int fd, int request, void *parm, const char *name) return retVal; } -static int parse_subopt(char **subs, char * const *subopts, char **value) +static int parse_subopt(char **subs, const char * const *subopts, char **value) { - int opt = getsubopt(subs, subopts, value); + int opt = getsubopt(subs, (char * const *)subopts, value); if (opt == -1) { fprintf(stderr, "Invalid suboptions specified\n"); @@ -322,7 +322,7 @@ int main(int argc, char **argv) subs = optarg; set_reg.match_type = V4L2_CHIP_MATCH_I2C_DRIVER; while (*subs != '\0') { - static char *const subopts[] = { + static const char * const subopts[] = { "type", "chip", "reg", @@ -352,7 +352,7 @@ int main(int argc, char **argv) subs = optarg; get_reg.match_type = V4L2_CHIP_MATCH_I2C_DRIVER; while (*subs != '\0') { - static char *const subopts[] = { + static const char * const subopts[] = { "type", "chip", "min", @@ -382,7 +382,7 @@ int main(int argc, char **argv) subs = optarg; set_reg.match_type = V4L2_CHIP_MATCH_I2C_DRIVER; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "type", "chip", NULL -- cgit v1.2.3