summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-12-25 03:14:09 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-25 03:14:09 +0100
commit5fa89b2cb366d533e56a9b7a9ce548480776f973 (patch)
tree9f928cc75c2ef6f8515654cd855a06a2769fb025
parentbd69054b0987b40a0df87d40772893f6f8a078da (diff)
import: prefer usec_t over time_t
-rw-r--r--src/import/curl-util.c4
-rw-r--r--src/import/curl-util.h2
-rw-r--r--src/import/import-gpt.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 78a58a8a6d..6a6b1c0004 100644
--- 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;
}
-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;
@@ -441,6 +441,6 @@ int curl_parse_http_time(const char *t, time_t *ret) {
if (v == (time_t) -1)
return -EINVAL;
- *ret = v;
+ *ret = (usec_t) v * USEC_PER_SEC;
return 0;
}
diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index b4d75e8951..c249069ffa 100644
--- 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);
-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);
diff --git a/src/import/import-gpt.c b/src/import/import-gpt.c
index eda6dcacbc..503f1e64cf 100644
--- 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;
- time_t mtime;
+ usec_t mtime;
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];
- 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);