| Message ID | 1417089778-8970-1-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 14-11-27 08:02 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/cmos/cmosdump/cmosdump.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/cmos/cmosdump/cmosdump.c b/src/cmos/cmosdump/cmosdump.c > index aff0373..1ab86d3 100644 > --- a/src/cmos/cmosdump/cmosdump.c > +++ b/src/cmos/cmosdump/cmosdump.c > @@ -265,7 +265,7 @@ static int cmosdump_test1(fwts_framework *fw) > primary_display[(data[20] >> 4) & 3]); > if (data[20] & 1) { > int drives = (data[20] >> 6) & 3; > - fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%hhu drive%s)", > + fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%d drive%s)", > drives, drives + 1, drives > 0 ? "s" : ""); > } else { > fwts_log_info_verbatum(fw, " Floppy Drives: None."); Acked-by: Alex Hung <alex.hung@canonical.com>
On 2014年11月27日 20:02, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/cmos/cmosdump/cmosdump.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/cmos/cmosdump/cmosdump.c b/src/cmos/cmosdump/cmosdump.c > index aff0373..1ab86d3 100644 > --- a/src/cmos/cmosdump/cmosdump.c > +++ b/src/cmos/cmosdump/cmosdump.c > @@ -265,7 +265,7 @@ static int cmosdump_test1(fwts_framework *fw) > primary_display[(data[20] >> 4) & 3]); > if (data[20] & 1) { > int drives = (data[20] >> 6) & 3; > - fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%hhu drive%s)", > + fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%d drive%s)", > drives, drives + 1, drives > 0 ? "s" : ""); > } else { > fwts_log_info_verbatum(fw, " Floppy Drives: None."); Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/cmos/cmosdump/cmosdump.c b/src/cmos/cmosdump/cmosdump.c index aff0373..1ab86d3 100644 --- a/src/cmos/cmosdump/cmosdump.c +++ b/src/cmos/cmosdump/cmosdump.c @@ -265,7 +265,7 @@ static int cmosdump_test1(fwts_framework *fw) primary_display[(data[20] >> 4) & 3]); if (data[20] & 1) { int drives = (data[20] >> 6) & 3; - fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%hhu drive%s)", + fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%d drive%s)", drives, drives + 1, drives > 0 ? "s" : ""); } else { fwts_log_info_verbatum(fw, " Floppy Drives: None.");