diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-30 12:03:15 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-30 12:03:15 +0000 |
| commit | 6ae13b5f8b827bc87a8cf3306c3caa1b97e49df3 (patch) | |
| tree | 9662164348a314705094f5f52456ab7bfe330df9 /src/couchdb/couch_auth_cache.erl | |
| parent | 1c0a6e9c637fcfec2990c6318b3c69e4c7591d76 (diff) | |
Removing ?getv macros.
With OTP releases up to R13B03 it's not possible to define a 2 macro functions with the same name and different arities.
(Only allowed in R13B04 and R14).
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1003025 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_auth_cache.erl')
| -rw-r--r-- | src/couchdb/couch_auth_cache.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl index d00a4fed..078bfcc1 100644 --- a/src/couchdb/couch_auth_cache.erl +++ b/src/couchdb/couch_auth_cache.erl @@ -52,7 +52,7 @@ get_user_creds(UserName) -> {<<"salt">>, ?l2b(Salt)}, {<<"password_sha">>, ?l2b(HashedPwd)}]; UserProps when is_list(UserProps) -> - DocRoles = ?getv(<<"roles">>, UserProps), + DocRoles = couch_util:get_value(<<"roles">>, UserProps), [{<<"roles">>, [<<"_admin">> | DocRoles]}, {<<"salt">>, ?l2b(Salt)}, {<<"password_sha">>, ?l2b(HashedPwd)}] @@ -83,7 +83,7 @@ get_from_cache(UserName) -> validate_user_creds(nil) -> nil; validate_user_creds(UserCreds) -> - case ?getv(<<"_conflicts">>, UserCreds) of + case couch_util:get_value(<<"_conflicts">>, UserCreds) of undefined -> ok; _ConflictList -> @@ -240,7 +240,7 @@ add_cache_entry(UserName, Credentials, ATime, State) -> end, true = ets:insert(?BY_ATIME, {ATime, UserName}), true = ets:insert(?BY_USER, {UserName, {Credentials, ATime}}), - State#state{cache_size = ?getv(size, ets:info(?BY_USER))}. + State#state{cache_size = couch_util:get_value(size, ets:info(?BY_USER))}. free_mru_cache_entry() -> |