diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2014-08-12 08:37:25 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-12 08:38:28 -0400 |
| commit | a2c4d71c2e84419a49db503ed59de4d3d1dca7dd (patch) | |
| tree | 68cf0d2c10eae032d52bad7e6489fe04e22d6952 /libacl | |
| parent | 809584283a3ce5b0250656faefb23a821782adbe (diff) | |
| download | acl-a2c4d71c2e84419a49db503ed59de4d3d1dca7dd.tar.gz | |
add __acl_ prefixes to internal symbols
When static linking libacl, people sometimes run into symbol collisions
because their own code defines symbols like "quote". So for acl internal
symbols, use an __acl_ prefix.
Diffstat (limited to 'libacl')
| -rw-r--r-- | libacl/__acl_to_any_text.c | 4 | ||||
| -rw-r--r-- | libacl/acl_from_text.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c index 1d10e81..de3925e 100644 --- a/libacl/__acl_to_any_text.c +++ b/libacl/__acl_to_any_text.c @@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, if (options & TEXT_NUMERIC_IDS) str = NULL; else - str = quote(user_name( + str = __acl_quote(user_name( entry_obj_p->eid.qid), ":, \t\n\r"); if (str != NULL) { strncpy(text_p, str, size); @@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, if (options & TEXT_NUMERIC_IDS) str = NULL; else - str = quote(group_name( + str = __acl_quote(group_name( entry_obj_p->eid.qid), ":, \t\n\r"); if (str != NULL) { strncpy(text_p, str, size); diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c index c08bd3b..83a4d21 100644 --- a/libacl/acl_from_text.c +++ b/libacl/acl_from_text.c @@ -212,7 +212,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) str = get_token(text_p); if (str) { entry_obj.etag = ACL_USER; - error = get_uid(unquote(str), + error = get_uid(__acl_unquote(str), &entry_obj.eid.qid); free(str); if (error) { @@ -231,7 +231,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) str = get_token(text_p); if (str) { entry_obj.etag = ACL_GROUP; - error = get_gid(unquote(str), + error = get_gid(__acl_unquote(str), &entry_obj.eid.qid); free(str); if (error) { |