mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 01:57:43 +00:00
Code Issues Releases Wiki Activity

libapparmor: constify aa_features pointer args where possible

Browse Source 
Making a previously non-const pointer arg const is not an ABI break, and
having const expresses the intent of the interface better

Signed-off-by: Ryan Lee <ryan.lee@canonical.com>
This commit is contained in:
Ryan Lee 2025-03-19 17:32:50 -07:00
parent 4476eb8288
commit 5554dd3b5b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/libapparmor/include/sys/apparmor.h
View File

@ -152,16 +152,16 @@ extern int aa_features_new_from_kernel(aa_features **features);
extern aa_features *aa_features_ref(aa_features *features); extern aa_features *aa_features_ref(aa_features *features);
extern void aa_features_unref(aa_features *features); extern void aa_features_unref(aa_features *features);
extern int aa_features_write_to_fd(aa_features *features, int fd); extern int aa_features_write_to_fd(const aa_features *features, int fd);
extern int aa_features_write_to_file(aa_features *features, extern int aa_features_write_to_file(const aa_features *features,
int dirfd, const char *path); int dirfd, const char *path);
extern bool aa_features_is_equal(aa_features *features1, extern bool aa_features_is_equal(const aa_features *features1,
aa_features *features2); const aa_features *features2);
extern int aa_features_check(int dirfd, const char *path, extern int aa_features_check(int dirfd, const char *path,
aa_features *features); aa_features *features);
extern bool aa_features_supports(aa_features *features, const char *str); extern bool aa_features_supports(const aa_features *features, const char *str);
extern char *aa_features_id(aa_features *features); extern char *aa_features_id(const aa_features *features);
extern char *aa_features_value(aa_features *features, const char *str, size_t *len); extern char *aa_features_value(const aa_features *features, const char *str, size_t *len);
typedef struct aa_kernel_interface aa_kernel_interface; typedef struct aa_kernel_interface aa_kernel_interface;
extern int aa_kernel_interface_new(aa_kernel_interface **kernel_interface, extern int aa_kernel_interface_new(aa_kernel_interface **kernel_interface,

16
libraries/libapparmor/src/features.c
View File

@ -604,11 +604,11 @@ void aa_features_unref(aa_features *features)
* *
* Returns: 0 on success, -1 on error with errno set * Returns: 0 on success, -1 on error with errno set
*/ */
int aa_features_write_to_fd(aa_features *features, int fd) int aa_features_write_to_fd(const aa_features *features, int fd)
{ {
size_t size; size_t size;
ssize_t retval; ssize_t retval;
char *string; const char *string;
string = features->string; string = features->string;
size = strlen(string); size = strlen(string);
@ -632,7 +632,7 @@ int aa_features_write_to_fd(aa_features *features, int fd)
* *
* Returns: 0 on success, -1 on error with errno set * Returns: 0 on success, -1 on error with errno set
*/ */
int aa_features_write_to_file(aa_features *features, int aa_features_write_to_file(const aa_features *features,
int dirfd, const char *path) int dirfd, const char *path)
{ {
autoclose int fd = -1; autoclose int fd = -1;
@ -653,7 +653,7 @@ int aa_features_write_to_file(aa_features *features,
* *
* Returns: true if they're equal, false if they're not or either are NULL * Returns: true if they're equal, false if they're not or either are NULL
*/ */
bool aa_features_is_equal(aa_features *features1, aa_features *features2) bool aa_features_is_equal(const aa_features *features1, const aa_features *features2)
{ {
return features1 && features2 && return features1 && features2 &&
strcmp(features1->string, features2->string) == 0; strcmp(features1->string, features2->string) == 0;
@ -697,7 +697,7 @@ int aa_features_check(int dirfd, const char *path,
return 0; return 0;
} }
static const char *features_lookup(aa_features *features, const char *str) static const char *features_lookup(const aa_features *features, const char *str)
{ {
const char *features_string = features->string; const char *features_string = features->string;
struct component components[32]; struct component components[32];
@ -739,7 +739,7 @@ static const char *features_lookup(aa_features *features, const char *str)
* *
* Returns: a bool specifying the support status of @str feature * Returns: a bool specifying the support status of @str feature
*/ */
bool aa_features_supports(aa_features *features, const char *str) bool aa_features_supports(const aa_features *features, const char *str)
{ {
const char *value = features_lookup(features, str); const char *value = features_lookup(features, str);
@ -760,7 +760,7 @@ bool aa_features_supports(aa_features *features, const char *str)
* EISDIR - @str is not a leaf node in the feature tree * EISDIR - @str is not a leaf node in the feature tree
*/ */
char *aa_features_value(aa_features *features, const char *str, size_t *len) char *aa_features_value(const aa_features *features, const char *str, size_t *len)
{ {
const char *start, *cur = features_lookup(features, str); const char *start, *cur = features_lookup(features, str);
@ -803,7 +803,7 @@ char *aa_features_value(aa_features *features, const char *str, size_t *len)
* Returns: a string identifying @features which must be freed by the * Returns: a string identifying @features which must be freed by the
* caller or NULL, with errno set, upon error * caller or NULL, with errno set, upon error
*/ */
char *aa_features_id(aa_features *features) char *aa_features_id(const aa_features *features)
{ {
return strdup(features->hash); return strdup(features->hash);
} }