Skip to content
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

Remove gmnow() helper fxn from ros3 VFD #5219

Closed
wants to merge 1 commit into from
Closed

Remove gmnow() helper fxn from ros3 VFD #5219

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/H5FDros3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,8 +750,8 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
*
* TODO: Find way to reuse/share?
*/
now = gmnow();
assert(now != NULL);
if (NULL == (now = gmtime(time(NULL))))
HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "gmtime() error");
if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while writing iso8601 timestamp");
if (FAIL == H5FD_s3comms_signing_key(signing_key, (const char *)fa->secret_key,
Expand Down
34 changes: 2 additions & 32 deletions src/H5FDs3comms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
if (request == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not allocate hrb_t request.");

now = gmnow();
if (NULL == (now = gmtime(time(NULL))))
HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "gmtime() error");
if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "could not format ISO8601 time.");

Expand Down Expand Up @@ -1394,37 +1395,6 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
* MISCELLANEOUS FUNCTIONS
****************************************************************************/

/*----------------------------------------------------------------------------
*
* Function: gmnow()
*
* Purpose:
*
* Get the output of `time.h`'s `gmtime()` call while minimizing setup
* clutter where important.
*
* Return:
*
* Pointer to resulting `struct tm`,as created by gmtime(time_t * T).
*
*----------------------------------------------------------------------------
*/
struct tm *
gmnow(void)
{
time_t now;
time_t *now_ptr = &now;
struct tm *ret_value = NULL;

/* Doctor assert, checks against error in time() */
if ((time_t)(-1) != time(now_ptr))
ret_value = gmtime(now_ptr);

assert(ret_value != NULL);

return ret_value;
} /* end gmnow() */

/*----------------------------------------------------------------------------
*
* Function: H5FD_s3comms_aws_canonical_request()
Expand Down
26 changes: 12 additions & 14 deletions src/H5FDs3comms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,23 +452,23 @@ typedef struct {
extern "C" {
#endif

/*******************************************
* DECLARATION OF HTTP FIELD LIST ROUTINES *
*******************************************/
/****************************
* HTTP FIELD LIST ROUTINES *
****************************/

H5_DLL herr_t H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value);

/***********************************************
* DECLARATION OF HTTP REQUEST BUFFER ROUTINES *
***********************************************/
/********************************
* HTTP REQUEST BUFFER ROUTINES *
********************************/

H5_DLL herr_t H5FD_s3comms_hrb_destroy(hrb_t **buf);

H5_DLL hrb_t *H5FD_s3comms_hrb_init_request(const char *verb, const char *resource, const char *host);

/*************************************
* DECLARATION OF S3REQUEST ROUTINES *
*************************************/
/**********************
* S3REQUEST ROUTINES *
**********************/

H5_DLL herr_t H5FD_s3comms_s3r_close(s3r_t *handle);

Expand All @@ -479,11 +479,9 @@ H5_DLL s3r_t *H5FD_s3comms_s3r_open(const char url[], const char region[], const

H5_DLL herr_t H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest);

/*********************************
* DECLARATION OF OTHER ROUTINES *
*********************************/

H5_DLL struct tm *gmnow(void);
/******************
* OTHER ROUTINES *
******************/

H5_DLL herr_t H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int cr_size,
char *signed_headers_dest, int sh_size, hrb_t *http_request);
Expand Down
2 changes: 1 addition & 1 deletion test/s3comms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ test_s3r_open(void)
TEST_ERROR;
}

if (NULL == (now = gmnow()))
if (NULL == (now = gmtime(time(NULL))))
TEST_ERROR;
if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
TEST_ERROR;
Expand Down
Loading