2
0
mirror of https://github.com/openvswitch/ovs synced 2025-09-05 00:35:33 +00:00

Avoid printf type modifiers not supported by MSVC C runtime library.

The MSVC C library printf() implementation does not support the 'z', 't',
'j', or 'hh' format specifiers.  This commit changes the Open vSwitch code
to avoid those format specifiers, switching to standard macros from
<inttypes.h> where available and inventing new macros resembling them
where necessary.  It also updates CodingStyle to specify the macros' use
and adds a Makefile rule to report violations.

Signed-off-by: Alin Serdean <aserdean@cloudbasesolutions.com>
Co-authored-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Alin Serdean
2013-11-25 23:38:48 -08:00
committed by Ben Pfaff
parent 4d3daf0481
commit 34582733d9
47 changed files with 180 additions and 133 deletions

View File

@@ -473,7 +473,7 @@ make_sockaddr_un(const char *name, struct sockaddr_un *un, socklen_t *un_len,
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
VLOG_WARN_RL(&rl, "Unix socket name %s is longer than maximum "
"%zu bytes", name, MAX_UN_LEN);
"%"PRIuSIZE" bytes", name, MAX_UN_LEN);
return error;
}
@@ -1050,7 +1050,7 @@ getsockopt_int(int fd, int level, int option, const char *optname, int *valuep)
VLOG_ERR_RL(&rl, "getsockopt(%s): %s", optname, ovs_strerror(error));
} else if (len != sizeof value) {
error = EINVAL;
VLOG_ERR_RL(&rl, "getsockopt(%s): value is %u bytes (expected %zu)",
VLOG_ERR_RL(&rl, "getsockopt(%s): value is %u bytes (expected %"PRIuSIZE")",
optname, (unsigned int) len, sizeof value);
} else {
error = 0;
@@ -1419,7 +1419,7 @@ recv_data_and_fds(int sock,
ovs_assert(n_fds > 0);
if (n_fds > SOUTIL_MAX_FDS) {
VLOG_ERR("%zu fds received but only %d supported",
VLOG_ERR("%"PRIuSIZE" fds received but only %d supported",
n_fds, SOUTIL_MAX_FDS);
for (i = 0; i < n_fds; i++) {
close(fds_data[i]);