From 93f82b6ad3e79aaab9fc1538d92c6a2d02e59bf8 Mon Sep 17 00:00:00 2001 From: James Morris Date: Wed, 29 Nov 2006 16:50:27 -0500 Subject: [PATCH] --- yaml --- r: 41946 b: refs/heads/master c: 6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/ss/policydb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cd4250ebfb7e..18ea34d8789b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 484b366932be0b73a22c74a82748ca10a721643e +refs/heads/master: 6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8 diff --git a/trunk/security/selinux/ss/policydb.c b/trunk/security/selinux/ss/policydb.c index ba48961f9d05..cd79c6338aa0 100644 --- a/trunk/security/selinux/ss/policydb.c +++ b/trunk/security/selinux/ss/policydb.c @@ -468,7 +468,7 @@ static int common_destroy(void *key, void *datum, void *p) return 0; } -static int class_destroy(void *key, void *datum, void *p) +static int cls_destroy(void *key, void *datum, void *p) { struct class_datum *cladatum; struct constraint_node *constraint, *ctemp; @@ -566,7 +566,7 @@ static int cat_destroy(void *key, void *datum, void *p) static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) = { common_destroy, - class_destroy, + cls_destroy, role_destroy, type_destroy, user_destroy, @@ -1124,7 +1124,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) out: return rc; bad: - class_destroy(key, cladatum, NULL); + cls_destroy(key, cladatum, NULL); goto out; }