[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH] Fix various format string mismatches.
On 31/10/13 18:01, Andrew Cooper wrote: > On 31/10/13 17:57, Alex Sharp wrote: >> Signed-off-by: Alex Sharp <alex.sharp@xxxxxxxxxxx> > Are you sure this patch is against the staging branch of xen.git? > > Your changes to pcifront would appear to conflict. > > ~Andrew Wait sorry - I was looking at the wrong bit. My mistake I would however agree with Samuel that the correct fix would be to change unsigned long *fun to unsigned int *fun. ~Andrew > >> --- >> extras/mini-os/fbfront.c | 4 ++-- >> extras/mini-os/pcifront.c | 2 +- >> extras/mini-os/xenbus/xenbus.c | 5 +++-- >> 3 files changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c >> index a276193..3c618b0 100644 >> --- a/extras/mini-os/fbfront.c >> +++ b/extras/mini-os/fbfront.c >> @@ -105,7 +105,7 @@ again: >> free(err); >> } >> >> - err = xenbus_printf(xbt, nodename, "page-ref","%u", virt_to_mfn(s)); >> + err = xenbus_printf(xbt, nodename, "page-ref","%lu", virt_to_mfn(s)); >> if (err) { >> message = "writing page-ref"; >> goto abort_transaction; >> @@ -468,7 +468,7 @@ again: >> free(err); >> } >> >> - err = xenbus_printf(xbt, nodename, "page-ref","%u", virt_to_mfn(s)); >> + err = xenbus_printf(xbt, nodename, "page-ref","%lu", virt_to_mfn(s)); >> if (err) { >> message = "writing page-ref"; >> goto abort_transaction; >> diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c >> index 7838021..c3d833e 100644 >> --- a/extras/mini-os/pcifront.c >> +++ b/extras/mini-os/pcifront.c >> @@ -424,7 +424,7 @@ int pcifront_physical_to_virtual (struct pcifront_dev >> *dev, >> continue; >> } >> >> - if (sscanf(s, "%x:%x:%x.%x", dom, bus, slot, fun) != 4) { >> + if (sscanf(s, "%x:%x:%x.%lx", dom, bus, slot, fun) != 4) { >> printk("\"%s\" does not look like a PCI device address\n", >> s); >> free(s); >> continue; >> diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c >> index ee1691b..717bba9 100644 >> --- a/extras/mini-os/xenbus/xenbus.c >> +++ b/extras/mini-os/xenbus/xenbus.c >> @@ -27,6 +27,7 @@ >> #include <xen/io/xs_wire.h> >> #include <mini-os/spinlock.h> >> #include <mini-os/xmalloc.h> >> +#include <inttypes.h> >> >> #define min(x,y) ({ \ >> typeof(x) tmpx = (x); \ >> @@ -672,7 +673,7 @@ char *xenbus_transaction_start(xenbus_transaction_t *xbt) >> err = errmsg(rep); >> if (err) >> return err; >> - sscanf((char *)(rep + 1), "%u", xbt); >> + sscanf((char *)(rep + 1), "%lu", xbt); >> free(rep); >> return NULL; >> } >> @@ -769,7 +770,7 @@ domid_t xenbus_get_self_id(void) >> domid_t ret; >> >> BUG_ON(xenbus_read(XBT_NIL, "domid", &dom_id)); >> - sscanf(dom_id, "%d", &ret); >> + sscanf(dom_id, "%"SCNd16, &ret); >> >> return ret; >> } > > _______________________________________________ > Xen-devel mailing list > Xen-devel@xxxxxxxxxxxxx > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |