Date: Fri, 23 Nov 2012 22:55:18 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219832 for review Message-ID: <201211232255.qANMtILm015393@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219832?ac=10 Change 219832 by rwatson@rwatson_cinnamon on 2012/11/23 22:54:43 Be more consistent with the remainder of OpenBSM and include config/config.h rather than config.h. Don't include config.h from synch.h, which is included only from .c files that already include config.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#4 (text+ko) ==== @@ -27,10 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#4 $ */ -#include "config.h" +#include <config/config.h> #include <sys/types.h> #include <sys/queue.h> ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 (text+ko) ==== @@ -27,12 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/param.h> /* MAXHOSTNAMELEN */ #include <sys/socket.h> ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 (text+ko) ==== @@ -26,12 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/param.h> /* MAXHOSTNAMELEN */ #include <sys/socket.h> ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 (text+ko) ==== @@ -26,14 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 $ */ /* UDS - UNIX Domain Socket */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/types.h> #include <sys/socket.h> ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#2 (text+ko) ==== @@ -26,12 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <config/config.h> #include <sys/param.h> #ifdef HAVE_JAIL ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#2 $ */ -#include "config.h" +#include <config/config.h> #ifdef HAVE_KQUEUE #include <sys/types.h> ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#2 (text+ko) ==== @@ -26,16 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#2 $ */ #ifndef _SYNCH_H_ #define _SYNCH_H_ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <errno.h> #include <pthread.h> #ifdef HAVE_PTHREAD_NP_H ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 (text+ko) ==== @@ -27,10 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 $ */ -#include "config.h" +#include <config/config.h> #include <stdio.h> #include <string.h> ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#2 $ */ -#include "config.h" +#include <config/config.h> #include <sys/param.h> #include <sys/stat.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211232255.qANMtILm015393>