Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 1 | From c3055ce9eb32d0d24abc5cea5e1d231c499312a7 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 19 Apr 2021 23:29:10 +0200 |
| 4 | Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on |
| 5 | 32bit arches with 64bit time_t |
| 6 | |
| 7 | Use intmax_t to print time_t |
| 8 | |
| 9 | time_t is platform dependent and some of architectures e.g. |
| 10 | x32, riscv32, arc use 64bit time_t even while they are 32bit |
| 11 | architectures, therefore directly using integer printf formats will not |
| 12 | work portably, use intmax_t to typecast time_t into printf family of |
| 13 | functions |
| 14 | |
| 15 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 19 | |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 20 | --- |
Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 21 | debuginfod/debuginfod-client.c | 8 ++++---- |
| 22 | 1 file changed, 4 insertions(+), 4 deletions(-) |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 23 | |
| 24 | diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c |
Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 25 | index ee7eda2..083ec2c 100644 |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 26 | --- a/debuginfod/debuginfod-client.c |
| 27 | +++ b/debuginfod/debuginfod-client.c |
Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 28 | @@ -226,7 +226,7 @@ debuginfod_config_cache(char *config_path, |
| 29 | if (fd < 0) |
| 30 | return -errno; |
| 31 | |
| 32 | - if (dprintf(fd, "%ld", cache_config_default_s) < 0) |
| 33 | + if (dprintf(fd, "%jd", (intmax_t)cache_config_default_s) < 0) |
| 34 | return -errno; |
| 35 | } |
| 36 | |
| 37 | @@ -234,7 +234,7 @@ debuginfod_config_cache(char *config_path, |
| 38 | FILE *config_file = fopen(config_path, "r"); |
| 39 | if (config_file) |
| 40 | { |
| 41 | - if (fscanf(config_file, "%ld", &cache_config) != 1) |
| 42 | + if (fscanf(config_file, "%jd", (intmax_t*)(&cache_config)) != 1) |
| 43 | cache_config = cache_config_default_s; |
| 44 | fclose(config_file); |
| 45 | } |
| 46 | @@ -267,7 +267,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 47 | if (fd < 0) |
| 48 | return -errno; |
| 49 | |
| 50 | - if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) |
| 51 | + if (dprintf(fd, "%jd", (intmax_t)cache_clean_default_interval_s) < 0) |
| 52 | return -errno; |
| 53 | |
| 54 | /* init max age config file. */ |
Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 55 | @@ -275,7 +275,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 56 | && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) |
| 57 | return -errno; |
| 58 | |
| 59 | - if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) |
| 60 | + if (dprintf(fd, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0) |
| 61 | return -errno; |
| 62 | |
| 63 | return 0; |