Date: Fri, 23 Nov 2012 23:20:45 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219835 for review Message-ID: <201211232320.qANNKj7W016845@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219835?ac=10 Change 219835 by rwatson@rwatson_cinnamon on 2012/11/23 23:20:12 Merge conversion to #include "" from #include <> from OpenBSM post-1.2-alpha2 to FreeBSD merge tree. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#2 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/auditdistd.c#3 $ */ #include <config/config.h> @@ -75,9 +75,8 @@ #include "sigtimedwait.h" #endif -#include <pjdlog.h> - #include "auditdistd.h" +#include "pjdlog.h" #include "proto.h" #include "subr.h" #include "synch.h" ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#2 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/receiver.c#3 $ */ #include <config/config.h> @@ -78,9 +78,8 @@ #include "renameat.h" #endif -#include <pjdlog.h> - #include "auditdistd.h" +#include "pjdlog.h" #include "proto.h" #include "sandbox.h" #include "subr.h" ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#2 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sandbox.c#3 $ */ #include <config/config.h> @@ -48,8 +48,7 @@ #include <strings.h> #include <unistd.h> -#include <pjdlog.h> - +#include "pjdlog.h" #include "sandbox.h" static int ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#2 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sender.c#3 $ */ #include <config/config.h> @@ -72,9 +72,8 @@ #include "sigtimedwait.h" #endif -#include <pjdlog.h> - #include "auditdistd.h" +#include "pjdlog.h" #include "proto.h" #include "sandbox.h" #include "subr.h" ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#2 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/subr.c#3 $ */ #include <config/config.h> @@ -48,9 +48,8 @@ #include <compat/strlcat.h> #endif -#include <pjdlog.h> - #include "auditdistd.h" +#include "pjdlog.h" #include "subr.h" int ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#2 $ + * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/trail.c#3 $ */ #include <config/config.h> @@ -60,8 +60,7 @@ #include "unlinkat.h" #endif -#include <pjdlog.h> - +#include "pjdlog.h" #include "trail.h" #define TRAIL_MAGIC 0x79a11
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211232320.qANNKj7W016845>