Mercurial > dovecot > core-2.2
changeset 21737:036d9f649c8b
auth: oauth2 - cleanup db_oauth2_lookup_callback_t
db parameter isn't needed, because request->db already contains it.
Also moved request parameter to be the first.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Thu, 16 Mar 2017 00:54:44 +0200 |
| parents | 7d3ad0620805 |
| children | 29066a72703a |
| files | src/auth/db-oauth2.c src/auth/db-oauth2.h src/auth/passdb-oauth2.c |
| diffstat | 3 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/db-oauth2.c Thu Mar 16 00:51:15 2017 +0200 +++ b/src/auth/db-oauth2.c Thu Mar 16 00:54:44 2017 +0200 @@ -408,7 +408,7 @@ if (callback != NULL) { DLLIST_REMOVE(&req->db->head, req); - callback(req->db, result, req, error, req->context); + callback(req, result, error, req->context); } }
--- a/src/auth/db-oauth2.h Thu Mar 16 00:51:15 2017 +0200 +++ b/src/auth/db-oauth2.h Thu Mar 16 00:54:44 2017 +0200 @@ -5,9 +5,8 @@ struct oauth2_request; struct db_oauth2_request; -typedef void db_oauth2_lookup_callback_t(struct db_oauth2 *db, +typedef void db_oauth2_lookup_callback_t(struct db_oauth2_request *request, enum passdb_result result, - struct db_oauth2_request *request, const char *error, void *context); struct db_oauth2_request { @@ -39,7 +38,7 @@ void db_oauth2_lookup(struct db_oauth2 *db, struct db_oauth2_request *req, const char *token, struct auth_request *request, db_oauth2_lookup_callback_t *callback, void *context); #define db_oauth2_lookup(db, req, token, request, callback, context) \ db_oauth2_lookup(db, req, token + \ - CALLBACK_TYPECHECK(callback, void(*)(struct db_oauth2*, enum passdb_result, struct db_oauth2_request *req, const char*, typeof(context))), \ + CALLBACK_TYPECHECK(callback, void(*)(struct db_oauth2_request *, enum passdb_result, const char*, typeof(context))), \ request, (db_oauth2_lookup_callback_t*)callback, (void*)context) #endif
--- a/src/auth/passdb-oauth2.c Thu Mar 16 00:51:15 2017 +0200 +++ b/src/auth/passdb-oauth2.c Thu Mar 16 00:54:44 2017 +0200 @@ -10,9 +10,8 @@ }; static void -oauth2_verify_plain_continue(struct db_oauth2 *db ATTR_UNUSED, - enum passdb_result result, - struct db_oauth2_request *req, const char *error, +oauth2_verify_plain_continue(struct db_oauth2_request *req, + enum passdb_result result, const char *error, struct auth_request *request) { if (result == PASSDB_RESULT_INTERNAL_FAILURE)