| Message ID | 1454971529-14830-1-git-send-email-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/08/2016 03:45 PM, John Snow wrote: > Coverity noticed that some variables are only used by debug prints, and > called them unused. Always compile the print statements. > > Bonus: Fix a printf I broke. Might be nice to mention the commit that broke it. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > hw/block/fdc.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > #define FLOPPY_DPRINTF(fmt, ...) \ > - do { printf("FLOPPY: " fmt , ## __VA_ARGS__); } while (0) > -#else > -#define FLOPPY_DPRINTF(fmt, ...) > -#endif > + do { \ > + if (DEBUG_FLOPPY) { \ > + fprintf(stderr, "FLOPPY: " fmt , ## __VA_ARGS__); \ The switch from stdout to stderr doesn't hurt, either, if you want to mention it in the commit as intentional. Reviewed-by: Eric Blake <eblake@redhat.com>
On 02/08/2016 06:11 PM, Eric Blake wrote: > On 02/08/2016 03:45 PM, John Snow wrote: >> Coverity noticed that some variables are only used by debug prints, and >> called them unused. Always compile the print statements. >> >> Bonus: Fix a printf I broke. > > Might be nice to mention the commit that broke it. > Sure. >> >> Signed-off-by: John Snow <jsnow@redhat.com> >> --- >> hw/block/fdc.c | 15 ++++++++------- >> 1 file changed, 8 insertions(+), 7 deletions(-) >> > >> #define FLOPPY_DPRINTF(fmt, ...) \ >> - do { printf("FLOPPY: " fmt , ## __VA_ARGS__); } while (0) >> -#else >> -#define FLOPPY_DPRINTF(fmt, ...) >> -#endif >> + do { \ >> + if (DEBUG_FLOPPY) { \ >> + fprintf(stderr, "FLOPPY: " fmt , ## __VA_ARGS__); \ > > The switch from stdout to stderr doesn't hurt, either, if you want to > mention it in the commit as intentional. > Sure 2x combo > Reviewed-by: Eric Blake <eblake@redhat.com> > Thanks!
diff --git a/hw/block/fdc.c b/hw/block/fdc.c index a6f22ef..9838d21 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -41,14 +41,15 @@ /********************************************************/ /* debug Floppy devices */ -//#define DEBUG_FLOPPY -#ifdef DEBUG_FLOPPY +#define DEBUG_FLOPPY 0 + #define FLOPPY_DPRINTF(fmt, ...) \ - do { printf("FLOPPY: " fmt , ## __VA_ARGS__); } while (0) -#else -#define FLOPPY_DPRINTF(fmt, ...) -#endif + do { \ + if (DEBUG_FLOPPY) { \ + fprintf(stderr, "FLOPPY: " fmt , ## __VA_ARGS__); \ + } \ + } while (0) /********************************************************/ /* Floppy drive emulation */ @@ -353,7 +354,7 @@ static int pick_geometry(FDrive *drv) parse = &fd_formats[size_match]; FLOPPY_DPRINTF("User requested floppy drive type '%s', " "but inserted medium appears to be a " - "%d sector '%s' type\n", + "%"PRId64" sector '%s' type\n", FloppyDriveType_lookup[drv->drive], nb_sectors, FloppyDriveType_lookup[parse->drive]);
Coverity noticed that some variables are only used by debug prints, and called them unused. Always compile the print statements. Bonus: Fix a printf I broke. Signed-off-by: John Snow <jsnow@redhat.com> --- hw/block/fdc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)