Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
lb: fix coverity warning
[vpp.git]
/
src
/
vppinfra
/
unix-formats.c
diff --git
a/src/vppinfra/unix-formats.c
b/src/vppinfra/unix-formats.c
index
b3b8c89
..
7059686
100644
(file)
--- a/
src/vppinfra/unix-formats.c
+++ b/
src/vppinfra/unix-formats.c
@@
-37,11
+37,17
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
+#if __linux__
# include <linux/unistd.h>
# include <linux/signal.h>
# include <linux/unistd.h>
# include <linux/signal.h>
+#endif
#else /* ! __KERNEL__ */
#else /* ! __KERNEL__ */
+#ifdef __APPLE__
+#define _XOPEN_SOURCE
+#endif
+
#define _GNU_SOURCE /* to get REG_* in ucontext.h */
#include <ucontext.h>
#undef _GNU_SOURCE
#define _GNU_SOURCE /* to get REG_* in ucontext.h */
#include <ucontext.h>
#undef _GNU_SOURCE
@@
-57,12
+63,14
@@
#include <math.h>
#include <vppinfra/time.h>
#include <math.h>
#include <vppinfra/time.h>
+#if __linux__
#include <vppinfra/linux/syscall.h>
#ifdef AF_NETLINK
#include <linux/types.h>
#include <linux/netlink.h>
#endif
#include <vppinfra/linux/syscall.h>
#ifdef AF_NETLINK
#include <linux/types.h>
#include <linux/netlink.h>
#endif
+#endif
#endif /* ! __KERNEL__ */
#endif /* ! __KERNEL__ */
@@
-277,6
+285,7
@@
u8 * format_sockaddr (u8 * s, va_list * args)
return s;
}
return s;
}
+#ifndef __APPLE__
u8 * format_tcp4_packet (u8 * s, va_list * args)
{
u8 * p = va_arg (*args, u8 *);
u8 * format_tcp4_packet (u8 * s, va_list * args)
{
u8 * p = va_arg (*args, u8 *);
@@
-803,11
+812,11
@@
u8 * format_timeval (u8 * s, va_list * args)
break;
case 'm':
what = tm->tm_mon + 1;
break;
case 'm':
what = tm->tm_mon + 1;
- what_fmt = "%2d";
+ what_fmt = "%
0
2d";
break;
case 'd':
what = tm->tm_mday;
break;
case 'd':
what = tm->tm_mday;
- what_fmt = "%2d";
+ what_fmt = "%
0
2d";
break;
case 'H':
what = tm->tm_hour;
break;
case 'H':
what = tm->tm_hour;
@@
-832,6
+841,7
@@
u8 * format_timeval (u8 * s, va_list * args)
return s;
}
return s;
}
+#endif
u8 * format_time_float (u8 * s, va_list * args)
{
u8 * format_time_float (u8 * s, va_list * args)
{