git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 38ddd0d1863f83e8ec545d0160bdf00bbb5569ba Mon Sep 17 00:00:00 2001
   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: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
  16
  17 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  18 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  19
  20 ---
  21  debuginfod/debuginfod-client.c | 10 +++++-----
  22  1 file changed, 5 insertions(+), 5 deletions(-)
  23
  24 diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
  25 index c875ee6..df9737d 100644
  26 --- a/debuginfod/debuginfod-client.c
  27 +++ b/debuginfod/debuginfod-client.c
  28 @@ -231,15 +231,15 @@ 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 -  long cache_config;
  38 +  int cache_config;
  39    FILE *config_file = fopen(config_path, "r");
  40    if (config_file)
  41      {
  42 -      if (fscanf(config_file, "%ld", &cache_config) != 1)
  43 +      if (fscanf(config_file, "%d", &cache_config) != 1)
  44          cache_config = cache_config_default_s;
  45        fclose(config_file);
  46      }
  47 @@ -272,7 +272,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
  48    if (fd < 0)
  49      return -errno;
  50
  51 -  if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0)
  52 +  if (dprintf(fd, "%jd", (intmax_t)cache_clean_default_interval_s) < 0)
  53      return -errno;
  54
  55    /* init max age config file.  */
  56 @@ -280,7 +280,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
  57        && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
  58      return -errno;
  59
  60 -  if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0)
  61 +  if (dprintf(fd, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0)
  62      return -errno;
  63
  64    return 0;