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.

diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index 4a43401b9f964d4337622be379856844e48f7c82..a65677f7bae4f9ffcc48446c1e242247bc9f0b2a 100644 (file)
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -420,7 +420,7 @@ static void db_oauth2_callback(struct db_oauth2_request *req,
 
        if (callback != NULL) {
                DLLIST_REMOVE(&req->db->head, req);
-               callback(req->db, result, req, error, req->context);
+               callback(req, result, error, req->context);
        }
 }
 

diff --git a/src/auth/db-oauth2.h b/src/auth/db-oauth2.h
index a44d51583cf16b1589919b14d225c9cda11f3c2f..2b46fbfc7c85c0b41a7f46a8aa742cd5ec6180bd 100644 (file)
--- a/src/auth/db-oauth2.h
+++ b/src/auth/db-oauth2.h
@@ -5,9 +5,8 @@ struct db_oauth2;
 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_unref(struct db_oauth2 **);
 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

diff --git a/src/auth/passdb-oauth2.c b/src/auth/passdb-oauth2.c
index f7b6e906bef016f42c481395b6ba315dbecd1e3a..a6ece68f2ef003c596c4eddc9241739f9d349148 100644 (file)
--- a/src/auth/passdb-oauth2.c
+++ b/src/auth/passdb-oauth2.c
@@ -10,9 +10,8 @@ struct oauth2_passdb_module {
 };
 
 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)