PERFORCE change 75892 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=75892

Change 75892 by rwatson at rwatson_paprika on 2005/04/24 16:29:44

	Rename HEADER_SIZE to BSM_HEADER_SIZE for API reasons.
	Rename TRAILER_SIZE to BSM_TRAILER_SIZE for API reasons.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#6 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#6 (text+ko) ====

@@ -31,8 +31,8 @@
  * contain pointers of whose contents we dont know the size
  * (e.g text tokens)
  */
-#define HEADER_SIZE     18
-#define TRAILER_SIZE    7
+#define BSM_HEADER_SIZE     18
+#define BSM_TRAILER_SIZE    7
         
 #define ADD_U_CHAR(loc, val) \
         do {\

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#5 (text+ko) ====

@@ -161,7 +161,7 @@
 		return -1; /* Invalid descriptor */
 	}
 
-	if (rec->len + tok->len + TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) {
+	if (rec->len + tok->len + BSM_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) {
 		errno = ENOMEM;
 		return (-1);
 	}
@@ -195,7 +195,7 @@
 	u_char *dptr;
 	int error;
 
-	tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE;
+	tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE;
 	header = au_to_header32(tot_rec_size, event, 0);
 	if (header == NULL)
 		return (-1);
@@ -272,7 +272,7 @@
 	}
 
 	
-	tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE;
+	tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE;
 
 	if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) {
 		/*
@@ -320,7 +320,7 @@
 		return (-1);
 	}
 
-	tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE;
+	tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE;
 	if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) ||
 	    (tot_rec_size > *buflen)) {
 		/*

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#2 (text+ko) ====

@@ -2057,7 +2057,7 @@
 	int err = 0;
 	int recoversize;
 
-	recoversize = len - tok->len - TRAILER_SIZE;
+	recoversize = len - tok->len - BSM_TRAILER_SIZE;
 	if(recoversize <= 0) {
 		return -1;
 	}
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message