summaryrefslogtreecommitdiff
path: root/alpine
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-07-02 16:52:15 -0600
committerEduardo Chappa <chappa@washington.edu>2020-07-02 16:52:15 -0600
commite1a0f879f922ce6015fa9f9555525fee3968e187 (patch)
treeac6a0d4cc98a7651d9bbf44ca9615e219bcc82b4 /alpine
parentfd6fa417350dff2ae92fdf95d34896240913f2e0 (diff)
downloadalpine-e1a0f879f922ce6015fa9f9555525fee3968e187.tar.xz
* Fix some compilation warnings in Windows. Reported by Barry Landy.
Diffstat (limited to 'alpine')
-rw-r--r--alpine/xoauth2conf.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/alpine/xoauth2conf.c b/alpine/xoauth2conf.c
index f21697c..1322777 100644
--- a/alpine/xoauth2conf.c
+++ b/alpine/xoauth2conf.c
@@ -373,7 +373,7 @@ oauth2_get_client_info(unsigned char *name, char *user)
void
write_xoauth_configuration(struct variable *v, struct variable **vlist, EditWhich ew)
{
- int i, j, k, m, n;
+ int i, k, m, n;
XOAUTH2_INFO_S *x = NULL, *y;
char ***alval, **lval, **l;
char *p;
@@ -384,6 +384,7 @@ write_xoauth_configuration(struct variable *v, struct variable **vlist, EditWhi
lval = fs_get((n+1)*sizeof(char *));
memset((void *) lval, 0, (n+1)*sizeof(char *));
+ m = -1;
alval = ALVAL(v, ew);
for (i = 0, k = 0; vlist[i] != NULL; i++){
if(x == NULL){
@@ -425,17 +426,9 @@ write_xoauth_configuration(struct variable *v, struct variable **vlist, EditWhi
}
/* don't let it get to here until we are done! */
lval[k++] = xoauth_config_line(x);
- if(alpine_oauth2_list[j].param[OA2_Id].value)
- fs_give((void **) &alpine_oauth2_list[j].param[OA2_Id].value);
- if(alpine_oauth2_list[j].param[OA2_Secret].value)
- fs_give((void **) &alpine_oauth2_list[j].param[OA2_Secret].value);
- if(alpine_oauth2_list[j].param[OA2_Tenant].value)
- fs_give((void **) &alpine_oauth2_list[j].param[OA2_Tenant].value);
- alpine_oauth2_list[j].param[OA2_Id].value = cpystr(x->client_id);
- alpine_oauth2_list[j].param[OA2_Secret].value = x->client_secret ? cpystr(x->client_secret) : NULL;
- alpine_oauth2_list[j].param[OA2_Tenant].value = x->tenant ? cpystr(x->tenant) : NULL;
/* get ready for next run */
free_xoauth2_info(&x);
+ m = -1;
}
if(k > 0){
lval[k] = NULL;