Remove un-needed stack variable 'ops'.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories

8 files changed, 16 insertions, 24 deletions

diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST:
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 3eed0a6..02bfa94 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -366,12 +366,11 @@ static int
 mac_policy_register(struct mac_policy_conf *mpc)
 {
 	struct mac_policy_conf *tmpc;
-	struct mac_policy_ops *ops;
 	struct mac_policy_op_entry *mpe;
 	int slot;
 
-	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC,
-	    M_WAITOK | M_ZERO);
+	MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*mpc->mpc_ops),
+	    M_MACOPVEC, M_WAITOK | M_ZERO);
 	for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) {
 		switch (mpe->mpe_constant) {
 		case MAC_OP_LAST: