PERFORCE change 16337 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16337

Change 16337 by rwatson at rwatson_tislabs on 2002/08/20 09:09:27

	Rename mac_te_init_label_as() to mac_te_create_label_as() and
	mac_te_init_label() to mac_te_create_label() to reflect when
	the calls are use.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#74 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#74 (text+ko) ====

@@ -549,7 +549,7 @@
 }
 
 static void
-mac_te_init_label_as(struct mac_te *mac_te, char *type)
+mac_te_create_label_as(struct mac_te *mac_te, char *type)
 {
 
 	bzero(&mac_te->mt_type, MAC_TE_TYPE_MAXLEN+1);
@@ -557,10 +557,10 @@
 }
 
 static void
-mac_te_init_label(struct mac_te *telabel)
+mac_te_create_label(struct mac_te *telabel)
 {
 
-	mac_te_init_label_as(telabel, MAC_TE_TYPE_UNINITIALIZED);
+	mac_te_create_label_as(telabel, MAC_TE_TYPE_UNINITIALIZED);
 }
 
 static void
@@ -588,14 +588,14 @@
 mac_te_create_proc0(struct ucred *cred)
 {
 
-	mac_te_init_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_KPROC);
+	mac_te_create_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_KPROC);
 }
 
 static void
 mac_te_create_proc1(struct ucred *cred)
 {
 
-	mac_te_init_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_INIT);
+	mac_te_create_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_INIT);
 }
 
 static void
@@ -859,9 +859,9 @@
 {
 
 	if (ifnet->if_type == IFT_LOOP) {
-		mac_te_init_label_as(SLOT(ifnetlabel), MAC_TE_TYPE_EQUAL);
+		mac_te_create_label_as(SLOT(ifnetlabel), MAC_TE_TYPE_EQUAL);
 	} else {
-		mac_te_init_label(SLOT(ifnetlabel));
+		mac_te_create_label(SLOT(ifnetlabel));
 	}
 }
 
@@ -901,7 +901,6 @@
     struct mbuf *fragment, struct label *fragmentlabel)
 {
 
-	mac_te_init_label(SLOT(fragmentlabel));
 	mac_te_copy_label(datagramlabel, fragmentlabel);
 }
 
@@ -927,7 +926,7 @@
     struct mbuf *mbuf, struct label *mblabel)
 {
 
-	mac_te_init_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL);
+	mac_te_create_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL);
 }
 
 static void
@@ -1046,8 +1045,8 @@
 {
 
 	/* mac_te_create_object(cred, label); */
-	mac_te_init_label_as(SLOT(mntlabel), MAC_TE_TYPE_FS);
-	mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS);
+	mac_te_create_label_as(SLOT(mntlabel), MAC_TE_TYPE_FS);
+	mac_te_create_label_as(SLOT(fslabel), MAC_TE_TYPE_FS);
 }
 
 static void
@@ -1055,8 +1054,8 @@
     struct label *mntlabel, struct label *fslabel)
 {
 
-	mac_te_init_label_as(SLOT(mntlabel), MAC_TE_TYPE_ROOTFS);
-	mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS);
+	mac_te_create_label_as(SLOT(mntlabel), MAC_TE_TYPE_ROOTFS);
+	mac_te_create_label_as(SLOT(fslabel), MAC_TE_TYPE_FS);
 }
 
 static void
@@ -1105,7 +1104,7 @@
 	else
 		te_type = MAC_TE_TYPE_DEVICE;
 
-	mac_te_init_label_as(SLOT(devicelabel), te_type);
+	mac_te_create_label_as(SLOT(devicelabel), te_type);
 }
 
 static void
@@ -1113,7 +1112,7 @@
     struct devfs_dirent *de, struct label *dirlabel)
 {
 
-	mac_te_init_label_as(SLOT(dirlabel), MAC_TE_TYPE_FS);
+	mac_te_create_label_as(SLOT(dirlabel), MAC_TE_TYPE_FS);
 }
 
 static void
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message