[ipfilter-cvs] ipfilter ip_compat.h,
Brought to you by:
darren_r
Menu
▾
▴
[ipfilter-cvs] ipfilter ip_compat.h,
|
From: Darren <dar...@us...> - 2012-07-20 08:48:27
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv32180
Modified Files:
ip_compat.h
Log Message:
3546266 macro letters could be more consistent
Index: ip_compat.h
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/ip_compat.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ip_compat.h 9 Jun 2012 06:19:01 -0000 1.52
--- ip_compat.h 20 Jul 2012 08:48:24 -0000 1.53
***************
*** 335,340 ****
# endif
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(x) msgdsize(x)
! # define M_LEN(x) ((x)->b_wptr - (x)->b_rptr)
# define M_ADJ(m,x) adjmsg(m, x)
# define M_COPY(x) dupmsg((x))
--- 335,340 ----
# endif
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(m) msgdsize(m)
! # define M_LEN(m) ((m)->b_wptr - (m)->b_rptr)
# define M_ADJ(m,x) adjmsg(m, x)
# define M_COPY(x) dupmsg((x))
***************
*** 518,525 ****
# define KFREE(x) kmem_free((char *)(x), sizeof(*(x)))
# define KFREES(x,s) kmem_free((char *)(x), (s))
! # define MSGDSIZE(x) msgdsize(x)
# define M_ADJ(m,x) adjmsg(m, x)
! # define M_LEN(x) ((x)->b_wptr - (x)->b_rptr)
! # define M_COPY(x) copymsg((x))
# define M_DUP(m) dupmsg(m)
# define MTOD(m,t) ((t)((m)->b_rptr))
--- 518,525 ----
# define KFREE(x) kmem_free((char *)(x), sizeof(*(x)))
# define KFREES(x,s) kmem_free((char *)(x), (s))
! # define MSGDSIZE(m) msgdsize(m)
# define M_ADJ(m,x) adjmsg(m, x)
! # define M_LEN(m) ((m)->b_wptr - (m)->b_rptr)
! # define M_COPY(m) copymsg((m))
# define M_DUP(m) dupmsg(m)
# define MTOD(m,t) ((t)((m)->b_rptr))
***************
*** 666,673 ****
extern void m_copydata(struct mbuf *, int, int, caddr_t);
extern void m_copyback(struct mbuf *, int, int, caddr_t);
! # define MSGDSIZE(x) mbufchainlen(x)
# define M_ADJ(m,x) m_adj(m, x)
# define M_LEN(x) (x)->m_len
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
--- 666,673 ----
extern void m_copydata(struct mbuf *, int, int, caddr_t);
extern void m_copyback(struct mbuf *, int, int, caddr_t);
! # define MSGDSIZE(m) mbufchainlen(m)
# define M_ADJ(m,x) m_adj(m, x)
# define M_LEN(x) (x)->m_len
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
***************
*** 741,749 ****
# define KFREE(x) FREE((x), M_PFILT)
# define KFREES(x,s) FREE((x), M_PFILT)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
! # define M_DUP(x) m_dup((x), M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
--- 741,749 ----
# define KFREE(x) FREE((x), M_PFILT)
# define KFREES(x,s) FREE((x), M_PFILT)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
! # define M_DUP(m) m_dup((m), M_COPYALL)
# define GETKTIME(x) microtime((struct timeval *)x)
# define IFNAME(x) ((struct ifnet *)x)->if_name
***************
*** 864,869 ****
# define PROC_T struct proc
# endif
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
--- 864,869 ----
# define PROC_T struct proc
# endif
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
***************
*** 1085,1090 ****
# define GET_MINOR dev2unit
# endif
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
--- 1085,1090 ----
# define GET_MINOR dev2unit
# endif
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
# define M_COPY(x) m_copy((x), 0, M_COPYALL)
***************
*** 1143,1150 ****
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); }
typedef struct mbuf mb_t;
--- 1143,1150 ----
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); }
typedef struct mbuf mb_t;
***************
*** 1179,1186 ****
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
typedef struct mbuf mb_t;
--- 1179,1186 ----
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
typedef struct mbuf mb_t;
***************
*** 1205,1212 ****
# include <sys/kmem_alloc.h>
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
# define GETIFP(n, v) ifunit(n, IFNAMSIZ)
--- 1205,1212 ----
# include <sys/kmem_alloc.h>
# define GETKTIME(x) uniqtime((struct timeval *)x)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define IFNAME(x) ((struct ifnet *)x)->if_name
# define GETIFP(n, v) ifunit(n, IFNAMSIZ)
***************
*** 1509,1516 ****
# define KFREE(x) FREE((x), M_TEMP)
# define KFREES(x,s) FREE((x), M_TEMP)
! # define MSGDSIZE(x) mbufchainlen(x)
! # define M_LEN(x) (x)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(x) m_copy((x), 0, M_COPYALL)
# define GETKTIME(x)
# define IPF_PANIC(x,y)
--- 1509,1516 ----
# define KFREE(x) FREE((x), M_TEMP)
# define KFREES(x,s) FREE((x), M_TEMP)
! # define MSGDSIZE(m) mbufchainlen(m)
! # define M_LEN(m) (m)->m_len
# define M_ADJ(m,x) m_adj(m, x)
! # define M_COPY(m) m_copy((m), 0, M_COPYALL)
# define GETKTIME(x)
# define IPF_PANIC(x,y)
***************
*** 1667,1675 ****
# undef m_data
# define m_data mb_data
! # define MSGDSIZE(x) msgdsize(x)
! # define M_LEN(x) (x)->mb_len
! # define M_ADJ(m,x) (x)->mb_len += x
! # define M_COPY(x) dupmbt(x)
! # define M_DUP(x) dupmbt(x)
# define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL)
# define MTOD(m, t) ((t)(m)->mb_data)
--- 1667,1675 ----
# undef m_data
# define m_data mb_data
! # define MSGDSIZE(m) msgdsize(m)
! # define M_LEN(m) (m)->mb_len
! # define M_ADJ(m,x) (m)->mb_len += x
! # define M_COPY(m) dupmbt(m)
! # define M_DUP(m) dupmbt(m)
# define GETKTIME(x) gettimeofday((struct timeval *)(x), NULL)
# define MTOD(m, t) ((t)(m)->mb_data)
|