diff options
| -rw-r--r-- | security/selinux/ss/hashtab.c | 6 | ||||
| -rw-r--r-- | security/selinux/ss/hashtab.h | 10 | ||||
| -rw-r--r-- | security/selinux/ss/symtab.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c index 24e5ec957630..77b530c3bbce 100644 --- a/security/selinux/ss/hashtab.c +++ b/security/selinux/ss/hashtab.c | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 9 | #include "hashtab.h" | 9 | #include "hashtab.h" |
| 10 | 10 | ||
| 11 | struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), | 11 | struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), |
| 12 | int (*keycmp)(struct hashtab *h, void *key1, void *key2), | 12 | int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), |
| 13 | u32 size) | 13 | u32 size) |
| 14 | { | 14 | { |
| 15 | struct hashtab *p; | 15 | struct hashtab *p; |
| @@ -71,7 +71,7 @@ int hashtab_insert(struct hashtab *h, void *key, void *datum) | |||
| 71 | return 0; | 71 | return 0; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | void *hashtab_search(struct hashtab *h, void *key) | 74 | void *hashtab_search(struct hashtab *h, const void *key) |
| 75 | { | 75 | { |
| 76 | u32 hvalue; | 76 | u32 hvalue; |
| 77 | struct hashtab_node *cur; | 77 | struct hashtab_node *cur; |
diff --git a/security/selinux/ss/hashtab.h b/security/selinux/ss/hashtab.h index 4cc85816a718..7e2ff3e3c6d2 100644 --- a/security/selinux/ss/hashtab.h +++ b/security/selinux/ss/hashtab.h | |||
| @@ -22,9 +22,9 @@ struct hashtab { | |||
| 22 | struct hashtab_node **htable; /* hash table */ | 22 | struct hashtab_node **htable; /* hash table */ |
| 23 | u32 size; /* number of slots in hash table */ | 23 | u32 size; /* number of slots in hash table */ |
| 24 | u32 nel; /* number of elements in hash table */ | 24 | u32 nel; /* number of elements in hash table */ |
| 25 | u32 (*hash_value)(struct hashtab *h, void *key); | 25 | u32 (*hash_value)(struct hashtab *h, const void *key); |
| 26 | /* hash function */ | 26 | /* hash function */ |
| 27 | int (*keycmp)(struct hashtab *h, void *key1, void *key2); | 27 | int (*keycmp)(struct hashtab *h, const void *key1, const void *key2); |
| 28 | /* key comparison function */ | 28 | /* key comparison function */ |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| @@ -39,8 +39,8 @@ struct hashtab_info { | |||
| 39 | * Returns NULL if insufficent space is available or | 39 | * Returns NULL if insufficent space is available or |
| 40 | * the new hash table otherwise. | 40 | * the new hash table otherwise. |
| 41 | */ | 41 | */ |
| 42 | struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), | 42 | struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), |
| 43 | int (*keycmp)(struct hashtab *h, void *key1, void *key2), | 43 | int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), |
| 44 | u32 size); | 44 | u32 size); |
| 45 | 45 | ||
| 46 | /* | 46 | /* |
| @@ -59,7 +59,7 @@ int hashtab_insert(struct hashtab *h, void *k, void *d); | |||
| 59 | * Returns NULL if no entry has the specified key or | 59 | * Returns NULL if no entry has the specified key or |
| 60 | * the datum of the entry otherwise. | 60 | * the datum of the entry otherwise. |
| 61 | */ | 61 | */ |
| 62 | void *hashtab_search(struct hashtab *h, void *k); | 62 | void *hashtab_search(struct hashtab *h, const void *k); |
| 63 | 63 | ||
| 64 | /* | 64 | /* |
| 65 | * Destroys the specified hash table. | 65 | * Destroys the specified hash table. |
diff --git a/security/selinux/ss/symtab.c b/security/selinux/ss/symtab.c index 24a10d36d3b6..837658a98a54 100644 --- a/security/selinux/ss/symtab.c +++ b/security/selinux/ss/symtab.c | |||
| @@ -9,9 +9,9 @@ | |||
| 9 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 10 | #include "symtab.h" | 10 | #include "symtab.h" |
| 11 | 11 | ||
| 12 | static unsigned int symhash(struct hashtab *h, void *key) | 12 | static unsigned int symhash(struct hashtab *h, const void *key) |
| 13 | { | 13 | { |
| 14 | char *p, *keyp; | 14 | const char *p, *keyp; |
| 15 | unsigned int size; | 15 | unsigned int size; |
| 16 | unsigned int val; | 16 | unsigned int val; |
| 17 | 17 | ||
| @@ -23,9 +23,9 @@ static unsigned int symhash(struct hashtab *h, void *key) | |||
| 23 | return val & (h->size - 1); | 23 | return val & (h->size - 1); |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | static int symcmp(struct hashtab *h, void *key1, void *key2) | 26 | static int symcmp(struct hashtab *h, const void *key1, const void *key2) |
| 27 | { | 27 | { |
| 28 | char *keyp1, *keyp2; | 28 | const char *keyp1, *keyp2; |
| 29 | 29 | ||
| 30 | keyp1 = key1; | 30 | keyp1 = key1; |
| 31 | keyp2 = key2; | 31 | keyp2 = key2; |
