Replaced %L by %ll, the former is obsolete and specific to Linux libc5.

diff --git a/images/sig-seg.c b/images/sig-seg.c
index cdcb71c8417ba147af293d0a1eb334fc644f66e1..933a784b3a286ae07cd8e6db3630a98f68803599 100644 (file)
--- a/images/sig-seg.c
+++ b/images/sig-seg.c
@@ -202,7 +202,7 @@ prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_regi
              split_val = val[k];
            }
        }
-      DBG("split_val=%u best_err=%Lu b[axis]=%u c[axis]=%u", split_val, (long long)best_err, region->b[axis], region->c[axis]);
+      DBG("split_val=%u best_err=%llu b[axis]=%u c[axis]=%u", split_val, (long long)best_err, region->b[axis], region->c[axis]);
 
       /* Split region */
       block = region->blocks;

diff --git a/lib/mainloop.c b/lib/mainloop.c
index affc4aec8efa0845ca67b20b01816464a2125cec..5344dcadc5609c7bce92ce2c635b1fdbac4febae 100644 (file)
--- a/lib/mainloop.c
+++ b/lib/mainloop.c
@@ -40,7 +40,7 @@ main_get_time(void)
   gettimeofday(&tv, NULL);
   main_now_seconds = tv.tv_sec;
   main_now = (timestamp_t)tv.tv_sec * 1000 + tv.tv_usec / 1000;
-  // DBG("It's %Ld o'clock", (long long) main_now);
+  // DBG("It's %lld o'clock", (long long) main_now);
 }
 
 void
@@ -60,7 +60,7 @@ void
 timer_add(struct main_timer *tm, timestamp_t expires)
 {
   if (expires)
-    DBG("MAIN: Setting timer %p (expire at now+%Ld)", tm, (long long)(expires-main_now));
+    DBG("MAIN: Setting timer %p (expire at now+%lld)", tm, (long long)(expires-main_now));
   else
     DBG("MAIN: Clearing timer %p", tm);
   if (tm->expires)
@@ -307,15 +307,15 @@ void
 main_debug(void)
 {
 #ifdef CONFIG_DEBUG
-  log(L_DEBUG, "### Main loop status on %Ld", (long long)main_now);
+  log(L_DEBUG, "### Main loop status on %lld", (long long)main_now);
   log(L_DEBUG, "\tActive timers:");
   struct main_timer *tm;
   CLIST_WALK(tm, main_timer_list)
-    log(L_DEBUG, "\t\t%p (expires %Ld, data %p)", tm, (long long)(tm->expires ? tm->expires-main_now : 999999), tm->data);
+    log(L_DEBUG, "\t\t%p (expires %lld, data %p)", tm, (long long)(tm->expires ? tm->expires-main_now : 999999), tm->data);
   struct main_file *fi;
   log(L_DEBUG, "\tActive files:");
   CLIST_WALK(fi, main_file_list)
-    log(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, eh %p, expires %Ld, data %p)",
+    log(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, eh %p, expires %lld, data %p)",
        fi, fi->fd, fi->read_handler, fi->write_handler, fi->error_handler,
        (long long)(fi->timer.expires ? fi->timer.expires-main_now : 999999), fi->data);
   log(L_DEBUG, "\tActive hooks:");
@@ -372,7 +372,7 @@ main_loop(void)
       timestamp_t wake = main_now + 1000000000;
       while ((tm = clist_head(&main_timer_list)) && tm->expires <= main_now)
        {
-         DBG("MAIN: Timer %p expired at now-%Ld", tm, (long long)(main_now - tm->expires));
+         DBG("MAIN: Timer %p expired at now-%lld", tm, (long long)(main_now - tm->expires));
          tm->handler(tm);
        }
       int hook_min = HOOK_RETRY;

diff --git a/lib/partmap.c b/lib/partmap.c
index 3b32bc9094ff04225c766d92e87b9c9730c478d9..baaef9c2129b70fa98ffe76a2c1d0f31a3911f56 100644 (file)
--- a/lib/partmap.c
+++ b/lib/partmap.c
@@ -75,7 +75,7 @@ partmap_load(struct partmap *p, sh_off_t start, uns size)
     die("partmap_map: Window is too small for mapping %d bytes", size);
   p->start_map = sh_mmap(NULL, win_len, p->writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, p->fd, win_start);
   if (p->start_map == MAP_FAILED)
-    die("mmap failed at position %Ld: %m", (long long)win_start);
+    die("mmap failed at position %lld: %m", (long long)win_start);
   p->start_off = win_start;
   p->end_off = win_start+win_len;
   madvise(p->start_map, win_len, MADV_SEQUENTIAL);

diff --git a/lib/profile.c b/lib/profile.c
index 0bd25aa9fc41cc5378a5bfa4563703c6f58b168d..83ff77c2dc7c4c9bc6a003e7c21aaa7134dcd0bb 100644 (file)
--- a/lib/profile.c
+++ b/lib/profile.c
@@ -68,7 +68,7 @@ prof_tsc_init(struct prof_tsc *c)
 int
 prof_tsc_format(char *buf, struct prof_tsc *c)
 {
-  return sprintf(buf, "%Ld", c->ticks);
+  return sprintf(buf, "%lld", c->ticks);
 }
 
 #endif
@@ -103,7 +103,7 @@ prof_ktsc_switch(struct prof_ktsc *o, struct prof_ktsc *n)
   int l = pread(self_prof_fd, buf, sizeof(buf)-1, 0);
   ASSERT(l > 0 && l < (int)sizeof(buf)-1);
   buf[l] = 0;
-  l = sscanf(buf, "%Ld%Ld", &u, &s);
+  l = sscanf(buf, "%lld%lld", &u, &s);
   ASSERT(l == 2);
 
   if (n)
@@ -123,7 +123,7 @@ prof_ktsc_switch(struct prof_ktsc *o, struct prof_ktsc *n)
 int
 prof_ktsc_format(char *buf, struct prof_ktsc *c)
 {
-  return sprintf(buf, "%Ld+%Ld", (long long) c->ticks_user, (long long) c->ticks_sys);
+  return sprintf(buf, "%lld+%lld", (long long) c->ticks_user, (long long) c->ticks_sys);
 }
 
 #endif

diff --git a/lib/shell/config.c b/lib/shell/config.c
index e1bcc0521cafd1f6004339bd3fb79964db2db8cb..ba60f0350980861c1ee24a21456e7425744efe4f 100644 (file)
--- a/lib/shell/config.c
+++ b/lib/shell/config.c
@@ -346,7 +346,7 @@ dump_value(uns array, struct item *item, void *v)
         sprintf(buf, "%d", *(int *)v);
         break;
       case CT_U64:
-        sprintf(buf, "%Lu", (long long) *(u64 *)v);
+        sprintf(buf, "%llu", (long long) *(u64 *)v);
        break;
       case CT_DOUBLE:
        sprintf(buf, "%g", *(double *)v);