Hi,

The attached patch fixes some format warnings as well as an implicit
declaration of ‘startup_essential_task’ in mach-defpager/main.c.

Applies nicely to hurd-0.9.git20221224 and latest git.

Thanks!
--- hurd-git/ext2fs/ext2fs.c	2022-12-08 15:05:29.808000000 +0100
+++ hurd-git/ext2fs/ext2fs.c	2022-12-08 19:11:12.604000000 +0100
@@ -232,7 +232,7 @@
   if (store->size < SBLOCK_OFFS + SBLOCK_SIZE)
     ext2_panic ("device too small for superblock (%Ld bytes)", store->size);
   if (store->log2_blocks_per_page < 0)
-    ext2_panic ("device block size (%zu) greater than page size (%lu)",
+    ext2_panic ("device block size (%zu) greater than page size (%u)",
 		store->block_size, vm_page_size);
 
   /* Map the entire disk. */
--- hurd-git/ext2fs/dir.c	2022-12-03 16:44:52.780000000 +0100
+++ hurd-git/ext2fs/dir.c	2022-12-09 11:35:05.296000000 +0100
@@ -415,7 +415,7 @@
 	  || EXT2_DIR_REC_LEN (entry->name_len) > le16toh (entry->rec_len)
 	  || memchr (entry->name, '\0', entry->name_len))
 	{
-	  ext2_warning ("bad directory entry: inode: %Ld offset: %lu",
+	  ext2_warning ("bad directory entry: inode: %Ld offset: %u",
 			dp->cache_id,
 			currentoff - blockaddr + idx * DIRBLKSIZ);
 	  return ENOENT;
--- hurd-git/libpager/data-request.c	2022-12-08 15:05:29.812000000 +0100
+++ hurd-git/libpager/data-request.c	2022-12-09 11:23:20.412000000 +0100
@@ -49,7 +49,7 @@
     }
   if (length != __vm_page_size)
     {
-      printf ("incg data request: bad length size %lu\n", length);
+      printf ("incg data request: bad length size %u\n", length);
       goto release_out;
     }
   if (offset % __vm_page_size)
--- hurd-git/libpager/data-return.c	2022-12-08 15:05:29.812000000 +0100
+++ hurd-git/libpager/data-return.c	2022-12-09 11:24:56.804000000 +0100
@@ -60,7 +60,7 @@
     }
   if (length % __vm_page_size)
     {
-      printf ("incg data return: bad length size %lu\n", length);
+      printf ("incg data return: bad length size %u\n", length);
       goto release_out;
     }
   if (offset % __vm_page_size)
--- hurd-git/libpager/data-unlock.c	2022-12-08 15:05:29.812000000 +0100
+++ hurd-git/libpager/data-unlock.c	2022-12-09 11:26:07.956000000 +0100
@@ -58,7 +58,7 @@
     }
   if (length != __vm_page_size)
     {
-      printf ("incg data unlock: bad length size %lu\n", length);
+      printf ("incg data unlock: bad length size %u\n", length);
       goto out;
     }
 
--- hurd-git/ext2fs/pager.c	2022-12-08 15:05:29.812000000 +0100
+++ hurd-git/ext2fs/pager.c	2022-12-08 19:23:39.856000000 +0100
@@ -642,7 +642,7 @@
       if (err == ENOSPC)
 	ext2_warning ("This filesystem is out of space.");
       else if (err)
-	ext2_warning ("inode=%Ld, page=0x%lx: %s",
+	ext2_warning ("inode=%Ld, page=0x%x: %s",
 		      node->cache_id, page, strerror (err));
 
       return err;
@@ -905,7 +905,7 @@
 disk_cache_init (void)
 {
   if (block_size != vm_page_size)
-    ext2_panic ("Block size %u != vm_page_size %lu",
+    ext2_panic ("Block size %u != vm_page_size %u",
 		block_size, vm_page_size);
 
   pthread_mutex_init (&disk_cache_lock, NULL);
--- hurd-git/mach-defpager/main.c	2022-12-04 14:53:41.232000000 +0100
+++ hurd-git/mach-defpager/main.c	2022-12-09 11:53:44.372000000 +0100
@@ -43,6 +43,7 @@
 #include <hurd/port.h>
 #include <hurd/fd.h>
 #include <hurd/paths.h>
+#include <hurd/startup.h>
 #include <assert-backtrace.h>
 /* XXX */
 

Reply via email to