Skip to content

Commit

Permalink
Remove obsolete structure field
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisHeimbigner committed Dec 16, 2023
1 parent 2cfb11d commit 4dd854f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
1 change: 0 additions & 1 deletion include/ncauth.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ typedef struct NCauth {
char *user; /*CURLOPT_USERNAME*/
char *pwd; /*CURLOPT_PASSWORD*/
} creds;
char* s3profile;
} NCauth;

#if defined(__cplusplus)
Expand Down
12 changes: 0 additions & 12 deletions libdispatch/dauth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
See COPYRIGHT for license information.
*/


#include "config.h"
#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -177,16 +176,6 @@ NC_authsetup(NCauth** authp, NCURI* uri)
nullfree(user);
nullfree(pwd);
}

/* Get the Default profile */
if((ret=NC_authgets3profile("no",&ap))) goto done;
if(ap == NULL)
if((ret=NC_authgets3profile("default",&ap))) goto done;
if(ap != NULL)
auth->s3profile = strdup(ap->name);
else
auth->s3profile = NULL;

if(authp) {*authp = auth; auth = NULL;}
done:
nullfree(uri_hostport);
Expand Down Expand Up @@ -217,7 +206,6 @@ NC_authfree(NCauth* auth)
nullfree(auth->proxy.pwd);
nullfree(auth->creds.user);
nullfree(auth->creds.pwd);
nullfree(auth->s3profile);
nullfree(auth);
}

Expand Down
4 changes: 4 additions & 0 deletions libdispatch/nch5s3comms.c
Original file line number Diff line number Diff line change
Expand Up @@ -1722,6 +1722,9 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
return (ret_value);
} /* end H5FD__s3comms_load_aws_creds_from_file() */

#if 0
Currently not used. See instead NC_aws_load_credentials.

/*----------------------------------------------------------------------------
* Function: NCH5_s3comms_load_aws_profile()
* Purpose :
Expand Down Expand Up @@ -1805,6 +1808,7 @@ NCH5_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *

return (ret_value);
} /* end NCH5_s3comms_load_aws_profile() */
#endif /*0*/

/*----------------------------------------------------------------------------
* Function: NCH5_s3comms_nlowercase()
Expand Down

0 comments on commit 4dd854f

Please sign in to comment.