CDRIVER-6151 replaced mcd-time.h with mlib utilities

src/libmongoc/src/mongoc/mcd-azure.c

@@ -20,6 +20,8 @@
 #include <mongoc/mongoc-util-private.h>
 
 #include <mlib/cmp.h>
+#include <mlib/duration.h>
+#include <mlib/timer.h>
 
 #define AZURE_API_VERSION "2018-02-01"
 
@@ -122,7 +124,7 @@ mcd_azure_access_token_try_init_from_json_str(mcd_azure_access_token *out,
       // which the token will be valid. strtoll() will saturate on range errors
       // and return zero on parse errors.
       char *parse_end;
-      long long s = strtoll(expires_in_str, &parse_end, 0);
+      const long long expires_in = strtoll(expires_in_str, &parse_end, 0);
       if (parse_end != expires_in_str + expires_in_len) {
          // Did not parse the entire string. Bad
          _mongoc_set_error(error,
@@ -132,7 +134,7 @@ mcd_azure_access_token_try_init_from_json_str(mcd_azure_access_token *out,
                            mlib_in_range(int, expires_in_len) ? (int)expires_in_len : INT_MAX,
                            expires_in_str);
       } else {
-         out->expires_in = mcd_seconds(s);
+         out->expires_in = mlib_duration(expires_in, s);
          okay = true;
       }
    }
@@ -174,7 +176,7 @@ mcd_azure_access_token_from_imds(mcd_azure_access_token *const out,
    mcd_azure_imds_request req = MCD_AZURE_IMDS_REQUEST_INIT;
    mcd_azure_imds_request_init(&req, opt_imds_host, opt_port, opt_extra_headers);
 
-   if (!_mongoc_http_send(&req.req, 3 * 1000, false, NULL, &resp, error)) {
+   if (!_mongoc_http_send(&req.req, mlib_expires_after(mlib_duration(3, s)), false, NULL, &resp, error)) {
       goto fail;
    }
 

src/libmongoc/src/mongoc/mcd-azure.h

@@ -21,9 +21,10 @@
 
 #include <mongoc/mongoc-http-private.h>
 
-#include <mongoc/mcd-time.h>
 #include <mongoc/mongoc.h>
 
+#include <mlib/duration.h>
+
 /**
  * @brief An Azure OAuth2 access token obtained from the Azure API
  */
@@ -36,7 +37,7 @@ typedef struct mcd_azure_access_token {
    char *token_type;
    /// The duration after which it will the token will expires. This is relative
    /// to the "issue time" of the token.
-   mcd_duration expires_in;
+   mlib_duration expires_in;
 } mcd_azure_access_token;
 
 /**