Skip to content

Make declaration, definition, and use of s3/oauth2_get_access_token consistent #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tautschnig wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make declaration, definition, and use of s3/oauth2_get_access_token consistent #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions device-src/s3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ typedef struct result_handling {
/*
* get the access token for OAUTH2
*/
static gboolean oauth2_get_access_token(S3Handle *hdl);
static s3_result_t oauth2_get_access_token(S3Handle *hdl);

/* Lookup a result in C{result_handling}.
*
Expand Down Expand Up @@ -2448,7 +2448,7 @@ perform_request(S3Handle *hdl,
if (hdl->s3_api == S3_API_OAUTH2 && !hdl->getting_oauth2_access_token &&
(!hdl->access_token || hdl->expires < time(NULL))) {
result = oauth2_get_access_token(hdl);
if (!result) {
if (result != S3_RESULT_OK) {
g_debug("oauth2_get_access_token returned %d", result);
return result;
}
Expand Down Expand Up @@ -2696,7 +2696,7 @@ perform_request(S3Handle *hdl,
if (hdl->s3_api == S3_API_OAUTH2 &&
hdl->last_response_code == 401 &&
hdl->last_s3_error_code == S3_ERROR_AuthenticationRequired) {
should_retry = oauth2_get_access_token(hdl);
should_retry = oauth2_get_access_token(hdl) == S3_RESULT_RETRY;
}
/* and, unless we know we need to retry, see what we're to do now */
if (!should_retry) {
Expand Down Expand Up @@ -4598,7 +4598,7 @@ oauth2_get_access_token(

cleanup:
g_free(body);
return result == S3_RESULT_OK;
result;
}

gboolean
Expand Down