v4l2-dbg: report fail reason to the user
PATCH 1/1 v4l2-dbg: report fail reason to the user
From: Márton Németh <[email protected]>
Report the fail reason to the user when writing a register even if the verbose mode is switched off.
Remove duplicated code ioctl() call which may cause different ioctl() function call in case of verbose and non verbose if not handled carefully.
---
v4l2-apps/util/v4l2-dbg.cpp +10 -8
@@ -354,13 +354,14 @@ { int retVal; - if (!options[OptVerbose]) return ioctl(fd, request, parm); retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno)); - else - printf("ok\n"); + if (options[OptVerbose]) { + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno)); + else + printf("ok\n"); + } return retVal; }
@@ -586,8 +587,9 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: " + "%s\n", + set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; }
Quoted 18 lines · On Sunday 08 November 2009 13:32:50 Németh Márton wrote:
From: Márton Németh <[email protected]>
Report the fail reason to the user when writing a register even if the verbose mode is switched off.
Remove duplicated code
ioctl()call which may cause differentioctl()function call in case of verbose and non verbose if not handled carefully.Signed-off-by Márton Németh <[email protected]>---
diff -r19c0469c02c3v4l2-apps/util/v4l2-dbg.cppv4l2-apps/util/v4l2-dbg.cpp +0
-1@@ -354,13 +354,14 @@ { int retVal; - if (!options[OptVerbose]) return ioctl(fd, request, parm);
v4l2-apps/util/v4l2-dbg.cpp line 361
Quoted 10 lines
v4l2-apps/util/v4l2-dbg.cpp +4
-5retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno)); - else - printf("ok\n"); + if (options[OptVerbose]) { + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno));
Strictly speaking if the printf two line back would produce an error, then errno would now contain the errno from the printf and not from the ioctl. So errno should be assigned to a local variable right after the ioctl.
Note that this was already a bug in the original code.
Note also that I fail to see any difference in the old vs the new code.
Quoted 7 lines
v4l2-apps/util/v4l2-dbg.cpp +3
-0+ else + printf("ok\n"); + } return retVal; }
v4l2-apps/util/v4l2-dbg.cpp line 591
Quoted 7 lines
v4l2-apps/util/v4l2-dbg.cpp +2
-2@@ -586,8 +587,9 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: " + "%s\n",
Please keep this printf on one line. Yes, you get a checkpatch warning but I'd rather have a slightly longer line than an ugly split line.
Regards,
Hans
Quoted 10 lines
v4l2-apps/util/v4l2-dbg.cpp +1
-1+ set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; } --To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 1 line
Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom
Quoted 34 lines · Hans Verkuil
Quoted 18 lines · On Sunday 08 November 2009 13:32:50 Németh Márton wrote:
From: Márton Németh <[email protected]>
Report the fail reason to the user when writing a register even if the verbose mode is switched off.
Remove duplicated code
ioctl()call which may cause differentioctl()function call in case of verbose and non verbose if not handled carefully.Signed-off-by Márton Németh <[email protected]>---
diff -r19c0469c02c3v4l2-apps/util/v4l2-dbg.cppv4l2-apps/util/v4l2-dbg.cpp +0
-1@@ -354,13 +354,14 @@ { int retVal; - if (!options[OptVerbose]) return ioctl(fd, request, parm);v4l2-apps/util/v4l2-dbg.cpp line 361
Quoted 10 lines
v4l2-apps/util/v4l2-dbg.cpp +4
-5retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno)); - else - printf("ok\n"); + if (options[OptVerbose]) { + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno));Strictly speaking if the printf two line back would produce an error, then errno would now contain the errno from the printf and not from the ioctl. So errno should be assigned to a local variable right after the ioctl.
Quoted 1 line
Note that this was already a bug in the original code.
You are right, this problem was not solved by the new code.
Quoted 1 line
Note also that I fail to see any difference in the old vs the new code.
In this function I only tried to modify the programming style: only one call to ioctl(). In the original code the ioctl() call was duplicated which which results a not-so-well maintainable code: if ever is needed to modify the parameters of the ioctl() then in the original code two lines would be needed to modify. The lines are to be modified exactly the same way in that case which may result different behaviour in case of verbose switched on or off.
Quoted 27 lines
Quoted 8 lines
v4l2-apps/util/v4l2-dbg.cpp +3
-0+ else + printf("ok\n"); + } return retVal; }v4l2-apps/util/v4l2-dbg.cpp line 591
Quoted 7 lines
v4l2-apps/util/v4l2-dbg.cpp +2
-2@@ -586,8 +587,9 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: " + "%s\n",Please keep this printf on one line. Yes, you get a checkpatch warning but I'd rather have a slightly longer line than an ugly split line.
Regards,
Hans
Quoted 4 lines
v4l2-apps/util/v4l2-dbg.cpp +1
-0+ set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; }
From: Márton Németh <[email protected]>
Report the fail reason to the user when writing a register even if the verbose mode is switched off.
Remove duplicated code ioctl() call which may cause different ioctl() function call in case of verbose and non verbose if not handled carefully.
---
v4l2-apps/util/v4l2-dbg.cpp +14 -7
@@ -353,14 +353,21 @@ static int doioctl(int fd, int request, void *parm, const char *name) { int retVal; + int ioctl_errno; if (!options[OptVerbose]) return ioctl(fd, request, parm); retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno)); - else - printf("ok\n"); + if (options[OptVerbose]) { + /* Save errno because printf() may modify it */ + ioctl_errno = errno; + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno)); + else + printf("ok\n"); + /* Restore errno for caller's use */ + errno = ioctl_errno; + } return retVal; }
@@ -586,8 +593,8 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: %s\n", + set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; }
Quoted 24 lines · On Thursday 12 November 2009 08:23:41 Németh Márton wrote:
From: Márton Németh <[email protected]>
Report the fail reason to the user when writing a register even if the verbose mode is switched off.
Remove duplicated code
ioctl()call which may cause differentioctl()function call in case of verbose and non verbose if not handled carefully.Signed-off-by Márton Németh <[email protected]>---
diff -r60f784aa071dv4l2-apps/util/v4l2-dbg.cppv4l2-apps/util/v4l2-dbg.cpp +1
-3@@ -353,14 +353,21 @@ static int doioctl(int fd, int request, void *parm, const char *name) { int retVal; + int ioctl_errno; if (!options[OptVerbose]) return ioctl(fd, request, parm); retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno));
v4l2-apps/util/v4l2-dbg.cpp line 367
Quoted 10 lines
v4l2-apps/util/v4l2-dbg.cpp +8
-2- else - printf("ok\n"); + if (options[OptVerbose]) { + /* Save errno because printf() may modify it */ + ioctl_errno = errno; + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno)); + else + printf("ok\n");
I'm an idiot for not realizing this when I did the first review, but this can be done without making a copy of errno. Just do this:
if (options[OptVerbose]) {
if (retVal < 0)
printf("%s: failed: %s\n", name, strerror(errno));
else
printf("%s: ok\n", name);Much simpler :-)
Can you change this and post again? Then I'll add it to my pending pull request.
Thanks,
Hans
Quoted 18 lines
v4l2-apps/util/v4l2-dbg.cpp +5
-2+ /* Restore errno for caller's use */ + errno = ioctl_errno; + } return retVal; }@@ -586,8 +593,8 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: %s\n", + set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; }
Signature · 1 line
Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom
From: Márton Németh <[email protected]>
Report the fail reason to the user when writing a register even if the verbose mode is switched off.
Remove duplicated code ioctl() call which may cause different ioctl() function call in case of verbose and non verbose if not handled carefully.
---
v4l2-apps/util/v4l2-dbg.cpp +9 -8
@@ -354,13 +354,14 @@ { int retVal; - if (!options[OptVerbose]) return ioctl(fd, request, parm); retVal = ioctl(fd, request, parm); - printf("%s: ", name); - if (retVal < 0) - printf("failed: %s\n", strerror(errno)); - else - printf("ok\n"); + if (options[OptVerbose]) { + printf("%s: ", name); + if (retVal < 0) + printf("failed: %s\n", strerror(errno)); + else + printf("ok\n"); + } return retVal; }
@@ -586,8 +587,8 @@ printf(" set to 0x%llx\n", set_reg.val); } else { - printf("Failed to set register 0x%08llx value 0x%llx\n", - set_reg.reg, set_reg.val); + printf("Failed to set register 0x%08llx value 0x%llx: %s\n", + set_reg.reg, set_reg.val, strerror(errno)); } set_reg.reg++; }