Thanks. Applied to master, branch-2.[23].
On Mon, Jun 09, 2014 at 11:04:09PM +0000, Pritesh Kothari (pritkoth) wrote:
> Acked-by: Pritesh Kothari <pritesh.koth...@cisco.com>
>
> On Jun 9, 2014, at 3:58 PM, Ben Pfaff <b...@nicira.com> wrote:
>
> > I think these were leftovers from the removal of %z for MSVC that happened
> > some time ago.
> >
> > VMware-BZ: 1265762
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > lib/netdev-bsd.c | 4 ++--
> > lib/netdev-linux.c | 2 +-
> > lib/netlink-socket.c | 2 +-
> > lib/netlink.c | 2 +-
> > 4 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c
> > index 8dc33df..35a8da4 100644
> > --- a/lib/netdev-bsd.c
> > +++ b/lib/netdev-bsd.c
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (c) 2011, 2013 Gaetano Catalli.
> > + * Copyright (c) 2011, 2013, 2014 Gaetano Catalli.
> > * Copyright (c) 2013, 2014 YAMAMOTO Takashi.
> > *
> > * Licensed under the Apache License, Version 2.0 (the "License");
> > @@ -714,7 +714,7 @@ netdev_bsd_send(struct netdev *netdev_, struct ofpbuf
> > *pkt, bool may_steal)
> > }
> > }
> > } else if (retval != size) {
> > - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"d
> > bytes of "
> > + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"
> > bytes of "
> > "%"PRIuSIZE") on %s", retval, size, name);
> > error = EMSGSIZE;
> > } else {
> > diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
> > index c1d9323..840022d 100644
> > --- a/lib/netdev-linux.c
> > +++ b/lib/netdev-linux.c
> > @@ -1125,7 +1125,7 @@ netdev_linux_send(struct netdev *netdev_, struct
> > ofpbuf *pkt, bool may_steal)
> > }
> > return errno;
> > } else if (retval != size) {
> > - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"d
> > bytes of "
> > + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"
> > bytes of "
> > "%"PRIuSIZE") on %s", retval, size,
> > netdev_get_name(netdev_));
> > return EMSGSIZE;
> > } else {
> > diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
> > index e4cc4ad..12d284a 100644
> > --- a/lib/netlink-socket.c
> > +++ b/lib/netlink-socket.c
> > @@ -347,7 +347,7 @@ nl_sock_recv__(struct nl_sock *sock, struct ofpbuf
> > *buf, bool wait)
> > if (retval < sizeof *nlmsghdr
> > || nlmsghdr->nlmsg_len < sizeof *nlmsghdr
> > || nlmsghdr->nlmsg_len > retval) {
> > - VLOG_ERR_RL(&rl, "received invalid nlmsg (%"PRIuSIZE"d bytes <
> > %"PRIuSIZE")",
> > + VLOG_ERR_RL(&rl, "received invalid nlmsg (%"PRIuSIZE" bytes <
> > %"PRIuSIZE")",
> > retval, sizeof *nlmsghdr);
> > return EPROTO;
> > }
> > diff --git a/lib/netlink.c b/lib/netlink.c
> > index bbd6b6d..c08a557 100644
> > --- a/lib/netlink.c
> > +++ b/lib/netlink.c
> > @@ -66,7 +66,7 @@ nl_msg_nlmsgerr(const struct ofpbuf *msg, int *errorp)
> > struct nlmsgerr *err = ofpbuf_at(msg, NLMSG_HDRLEN, sizeof *err);
> > int code = EPROTO;
> > if (!err) {
> > - VLOG_ERR_RL(&rl, "received invalid nlmsgerr (%"PRIu32"d bytes
> > < %"PRIuSIZE"d)",
> > + VLOG_ERR_RL(&rl, "received invalid nlmsgerr (%"PRIu32" bytes <
> > %"PRIuSIZE")",
> > ofpbuf_size(msg), NLMSG_HDRLEN + sizeof *err);
> > } else if (err->error <= 0 && err->error > INT_MIN) {
> > code = -err->error;
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
