shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

import: prefer usec_t over time_t

Browse Source
This commit is contained in:
Lennart Poettering 2014-12-25 03:14:09 +01:00
parent bd69054b09
commit 5fa89b2cb3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/import/curl-util.c
View File

@ -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;
}

2
src/import/curl-util.h
View File

@ -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);

4
src/import/import-gpt.c
View File

@ -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);