import: prefer usec_t over time_t

diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 78a58a8a6df6bad89311ae37a34c104d9e9242df..6a6b1c00048c7f75b58c4af3fe944f7ddf90e0c6 100644 (file)
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -414,7 +414,7 @@ int curl_header_strdup(const void *contents, size_t sz, const char *field, char
         return 1;
 }
 
         return 1;
 }
 

-int curl_parse_http_time(const char *t, time_t *ret) {
+int curl_parse_http_time(const char *t, usec_t *ret) {

         struct tm tm;
         time_t v;
 
         struct tm tm;
         time_t v;
 


@@ -441,6 +441,6 @@ int curl_parse_http_time(const char *t, time_t *ret) {
         if (v == (time_t) -1)
                 return -EINVAL;
 
         if (v == (time_t) -1)
                 return -EINVAL;
 

-        *ret = v;
+        *ret = (usec_t) v * USEC_PER_SEC;

         return 0;
 }
         return 0;
 }

diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index b4d75e89517740de7c0ff5c311a58a92bd308b93..c249069ffacf5142d6ba10cacaada5a9161ff975 100644 (file)
--- a/src/import/curl-util.h
+++ b/src/import/curl-util.h
@@ -51,7 +51,7 @@ void curl_glue_remove_and_free(CurlGlue *g, CURL *c);
 
 struct curl_slist *curl_slist_new(const char *first, ...) _sentinel_;
 int curl_header_strdup(const void *contents, size_t sz, const char *field, char **value);
 
 struct curl_slist *curl_slist_new(const char *first, ...) _sentinel_;
 int curl_header_strdup(const void *contents, size_t sz, const char *field, char **value);

-int curl_parse_http_time(const char *t, time_t *ret);
+int curl_parse_http_time(const char *t, usec_t *ret);

 
 DEFINE_TRIVIAL_CLEANUP_FUNC(CURL*, curl_easy_cleanup);
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct curl_slist*, curl_slist_free_all);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(CURL*, curl_easy_cleanup);
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct curl_slist*, curl_slist_free_all);

diff --git a/src/import/import-gpt.c b/src/import/import-gpt.c
index eda6dcacbc4359ba4193749f9ff4f46b464888b6..503f1e64cf6121e49c9504474e5048a176eb3d5f 100644 (file)
--- a/src/import/import-gpt.c
+++ b/src/import/import-gpt.c
@@ -46,7 +46,7 @@ struct GptImportFile {
         uint64_t content_length;
         uint64_t written;
 
         uint64_t content_length;
         uint64_t written;
 

-        time_t mtime;
+        usec_t mtime;

 
         bool force_local;
         bool done;
 
         bool force_local;
         bool done;


@@ -167,7 +167,7 @@ static void gpt_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
         if (f->mtime != 0) {
                 struct timespec ut[2];
 
         if (f->mtime != 0) {
                 struct timespec ut[2];
 

-                timespec_store(&ut[0], (usec_t) f->mtime * USEC_PER_SEC);
+                timespec_store(&ut[0], f->mtime);

                 ut[1] = ut[0];
 
                 (void) futimens(f->disk_fd, ut);
                 ut[1] = ut[0];
 
                 (void) futimens(f->disk_fd, ut);