panic: declare as printf-style-checked

	. and related fixes

Change-Id: I5131ac57dc53d8aec8d421a34c5ceea383404d7a

diff --git a/drivers/ahci/ahci.c b/drivers/ahci/ahci.c
index 033a76423ee635d4f04a57057c8e2d26069694db..b859e168530b04568ce875b910a9c872a96af7de 100644 (file)
--- a/drivers/ahci/ahci.c
+++ b/drivers/ahci/ahci.c
@@ -2087,7 +2087,7 @@ static void ahci_init(int devind)
         * the actual total number of ports to the size of the exposed area.
         */
        if (size < AHCI_MEM_BASE_SIZE + AHCI_MEM_PORT_SIZE)
-               panic("HBA memory size too small: %lu", size);
+               panic("HBA memory size too small: %u", size);
 
        size = MIN(size, AHCI_MEM_BASE_SIZE + AHCI_MEM_PORT_SIZE * NR_PORTS);
 

diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c
index 0968ddb2ed9bcf3a8b4be25d7936c95bd51a597b..5108cf6ad3ca569d26519a897c0a932add9246e6 100644 (file)
--- a/drivers/at_wini/at_wini.c
+++ b/drivers/at_wini/at_wini.c
@@ -1536,7 +1536,7 @@ static int setup_dma(
                if (n > size)
                        n= size;
                if (n == 0 || (n & 1))
-                       panic("bad size in iov: %d", iov[i].iov_size);
+                       panic("bad size in iov: 0x%lx", iov[i].iov_size);
                if(proc_nr != SELF) {
                        r= sys_umap(proc_nr, VM_GRANT, iov[i].iov_addr, n,
                                &user_phys);
@@ -1609,7 +1609,7 @@ static int setup_dma(
                panic("Bus master IDE active");
 
        if (prdt_phys & 3)
-               panic("prdt not aligned: %d", prdt_phys);
+               panic("prdt not aligned: 0x%lx", prdt_phys);
        r= sys_outl(wn->base_dma + DMA_PRDTP, prdt_phys);
        if (r != 0) panic("setup_dma: sys_outl failed: %d", r);
 

diff --git a/drivers/dpeth/8390.c b/drivers/dpeth/8390.c
index 43f81dedaf7f3543d35681152751749c2939c5e2..521a34159e427853c4c03989aa587a0674eae2e2 100644 (file)
--- a/drivers/dpeth/8390.c
+++ b/drivers/dpeth/8390.c
@@ -273,7 +273,7 @@ static void pio_user2nic(dpeth_t *dep, int pageno, int pktsize)
        if (inb_reg0(dep, DP_ISR) & ISR_RDC) break;
   }
   if (ix == 100) {
-       panic(RdmaErrMsg);
+       panic("%s", RdmaErrMsg);
   }
   return;
 }

diff --git a/include/minix/sysutil.h b/include/minix/sysutil.h
index 102ff575846648c7bed04a804303c1d51b4328b5..c676277c9c75edc672f0c5d75ce2ab460789136f 100644 (file)
--- a/include/minix/sysutil.h
+++ b/include/minix/sysutil.h
@@ -48,7 +48,8 @@ int fkey_ctl(int req, int *fkeys, int *sfkeys);
 
 int printf(const char *fmt, ...);
 void kputc(int c);
-__dead void panic(const char *fmt, ...);
+__dead void panic(const char *fmt, ...)
+     __attribute__((__format__(__printf__,1,2)));
 int getuptime(clock_t *ticks, clock_t *realtime, time_t *boottime);
 int getticks(clock_t *ticks);
 int tickdelay(clock_t ticks);

diff --git a/kernel/arch/i386/memory.c b/kernel/arch/i386/memory.c
index 3eca8bbba1048992f8a3535c4da69ae4bce1a300..943a26a7a92c03756436887100895603acf0e246 100644 (file)
--- a/kernel/arch/i386/memory.c
+++ b/kernel/arch/i386/memory.c
@@ -289,7 +289,7 @@ vir_bytes bytes;                /* # of bytes to be copied */
                phys = 0;
        } else {
                if(phys == 0)
-                       panic("vm_lookup returned phys: %d",  phys);
+                       panic("vm_lookup returned phys: 0x%lx",  phys);
        }
 
        if(phys == 0) {

diff --git a/lib/libddekit/src/panic.c b/lib/libddekit/src/panic.c
index ad63e3ab5eb8c2342a39ea9c6efdad09358d0dc1..a3c8e6a1b20fed0c73ae629833b549961c38282b 100644 (file)
--- a/lib/libddekit/src/panic.c
+++ b/lib/libddekit/src/panic.c
@@ -15,7 +15,7 @@ void ddekit_panic(char *fmt, ...)
     va_start(va,fmt);
     r = vprintf(fmt, va);
     va_end(va);
-       panic("","",0); 
+       panic("panicced");      
 
        while(1)
                ;

diff --git a/lib/libdevman/generic.c b/lib/libdevman/generic.c
index ff77cc992a973f44c367605e419ae23190a0da4d..ee79cfc3e7639b02cb768ecd14be05f140866f0c 100644 (file)
--- a/lib/libdevman/generic.c
+++ b/lib/libdevman/generic.c
@@ -128,7 +128,7 @@ int devman_add_device(struct devman_dev *dev)
        }
        
        if (msg.DEVMAN_RESULT != 0) {
-               panic("devman_add_device: could add device: %d",
+               panic("devman_add_device: could add device: %ld",
                    msg.DEVMAN_RESULT);
        }
 
@@ -168,7 +168,7 @@ int devman_del_device(struct devman_dev *dev)
        }
        
        if (msg.DEVMAN_RESULT != 0) {
-               panic("devman_del_device: could delete device: %d",
+               panic("devman_del_device: could delete device: %ld",
                    msg.DEVMAN_RESULT);
        }
 

diff --git a/lib/libdevman/usb.c b/lib/libdevman/usb.c
index 699f45c488e73f13254ce6077b6f982badde16be..65d0ff347d5a8997c05564684373da4dfa8f1ce7 100644 (file)
--- a/lib/libdevman/usb.c
+++ b/lib/libdevman/usb.c
@@ -11,7 +11,7 @@
 #include "local.h"
 
 #define CHECKOUTOFMEM(ptr) if(ptr == NULL) \
-                               panic("Out of memory! (%s, line %d)" \
+                               panic("Out of memory! (%s, line %d)", \
                                                             __FILE__, __LINE__)
 
 

diff --git a/lib/libminixfs/cache.c b/lib/libminixfs/cache.c
index ad3c6469be9071cfba56fafc001bcacc9c4c9943..adb482d9933bac45ff5c81a2efa52a67679124fa 100644 (file)
--- a/lib/libminixfs/cache.c
+++ b/lib/libminixfs/cache.c
@@ -472,7 +472,7 @@ int block_type;                     /* INODE_BLOCK, DIRECTORY_BLOCK, or whatever */
                        printf("libminixfs: ENOSYS, disabling VM calls\n");
                        vmcache = 0;
                } else {
-                       panic("libminixfs: setblock of 0x%lx dev 0x%x off "
+                       panic("libminixfs: setblock of %p dev 0x%x off "
                                "0x%llx failed\n", bp->data, dev, dev_off);
                }
        }

diff --git a/lib/libsys/vm_cache.c b/lib/libsys/vm_cache.c
index 73883203cffae18d4cb850ff63941a78ca350035..ce844acf0cae6ae54c61f02bd0e7c22e25a109bd 100644 (file)
--- a/lib/libsys/vm_cache.c
+++ b/lib/libsys/vm_cache.c
@@ -17,11 +17,11 @@ int vm_cachecall(message *m, int call, void *addr, u32_t dev, u64_t dev_offset,
                blocksize, PAGE_SIZE);
 
     if(ino_offset % PAGE_SIZE)
-       panic("inode offset %d should be a multiple of pagesize %d\n",
+       panic("inode offset %lld should be a multiple of pagesize %d\n",
                ino_offset, PAGE_SIZE);
 
     if(dev_offset % PAGE_SIZE)
-       panic("dev offset offset %d should be a multiple of pagesize %d\n",
+       panic("dev offset offset %lld should be a multiple of pagesize %d\n",
                dev_offset, PAGE_SIZE);
 
     memset(m, 0, sizeof(*m));

diff --git a/lib/libusb/usb.c b/lib/libusb/usb.c
index 0b3ffcdaaaf426056b26ec7053f53c8b6fac5ccb..be865f89107dfbe0e661155679fab5bae6a008be 100644 (file)
--- a/lib/libusb/usb.c
+++ b/lib/libusb/usb.c
@@ -59,7 +59,7 @@ int usb_send_urb(struct usb_urb* urb)
        }
 
        if (msg.USB_RESULT != 0) {
-               panic("usb_send_urb: hcd could not enqueue URB: %d", msg.USB_RESULT);
+               panic("usb_send_urb: hcd could not enqueue URB: %ld", msg.USB_RESULT);
        }
        
        /* everything ok, add urb to pending_urbs */
@@ -145,7 +145,7 @@ int usb_init(char *name)
        }
 
        if (msg.USB_RESULT != 0 ) {
-               panic("usb_init: init failed: %d", msg.USB_RESULT);
+               panic("usb_init: init failed: %ld", msg.USB_RESULT);
        }
 
        return 0;

diff --git a/lib/libvirtio/virtio.c b/lib/libvirtio/virtio.c
index 4fb77a6ab29ea3ebf7167fdec1cad773a32c0155..787987083e51e9e92bdb7b49604df957792ed070 100644 (file)
--- a/lib/libvirtio/virtio.c
+++ b/lib/libvirtio/virtio.c
@@ -498,7 +498,7 @@ clear_indirect_table(struct virtio_device *dev, struct vring_desc *vd)
        }
 
        if (i >= dev->num_indirect)
-               panic("%s: Could not clear indirect descriptor table ");
+               panic("Could not clear indirect descriptor table ");
 }
 
 
@@ -538,7 +538,7 @@ set_indirect_descriptors(struct virtio_device *dev, struct virtio_queue *q,
 
        /* Sanity check */
        if (i >= dev->num_indirect)
-               panic("%s: No indirect descriptor tables left");
+               panic("No indirect descriptor tables left");
 
        /* For indirect descriptor tables, only a single descriptor from
         * the main ring is used.

diff --git a/lib/libvtreefs/vtreefs.c b/lib/libvtreefs/vtreefs.c
index 2131d53012d232e295dccc2244f4bcacb68dbe8e..1c69e0868cd6bfad9328084a25cfa19d2cda8c8e 100644 (file)
--- a/lib/libvtreefs/vtreefs.c
+++ b/lib/libvtreefs/vtreefs.c
@@ -115,7 +115,7 @@ static int get_work(void)
        int r;
 
        if ((r = sef_receive(ANY, &fs_m_in)) != OK)
-               panic(__FILE__, "receive failed", r);
+               panic("receive failed: %d", r);
 
        return fs_m_in.m_type;
 }
@@ -135,7 +135,7 @@ static void send_reply(int err, int transid)
        }
 
        if ((r = send(fs_m_in.m_source, &fs_m_out)) != OK)
-               panic(__FILE__, "unable to send reply", r);
+               panic("unable to send reply: %d", r);
 }
 
 /*===========================================================================*

diff --git a/servers/ext2/balloc.c b/servers/ext2/balloc.c
index 759220c242f86a459498770fd2af80fbca2c49ea..bef14964c94d37c1f7590c89fe29d92c82076253 100644 (file)
--- a/servers/ext2/balloc.c
+++ b/servers/ext2/balloc.c
@@ -316,7 +316,7 @@ void free_block(struct super_block *sp, bit_t bit_returned)
   bp = get_block(sp->s_dev, gd->block_bitmap, NORMAL);
 
   if (unsetbit(b_bitmap(bp), bit))
-       panic("Tried to free unused block", bit_returned);
+       panic("Tried to free unused block %d", bit_returned);
 
   lmfs_markdirty(bp);
   put_block(bp, MAP_BLOCK);

diff --git a/servers/ext2/ialloc.c b/servers/ext2/ialloc.c
index 187733e10b3533a71f5491487942932adfee020d..6cb18106da85ad8b09c4a333d54f7a485ed760f9 100644 (file)
--- a/servers/ext2/ialloc.c
+++ b/servers/ext2/ialloc.c
@@ -229,7 +229,7 @@ static void free_inode_bit(struct super_block *sp, bit_t bit_returned,
   bp = get_block(sp->s_dev, gd->inode_bitmap, NORMAL);
 
   if (unsetbit(b_bitmap(bp), bit))
-       panic("Tried to free unused inode", bit_returned);
+       panic("Tried to free unused inode %d", bit_returned);
 
   lmfs_markdirty(bp);
   put_block(bp, MAP_BLOCK);

diff --git a/servers/ext2/inode.c b/servers/ext2/inode.c
index 72a228991bea10aed89632f0f0e7905f2b32e9f1..45107d94fe2c9ef2c1802f7073ed85df11a376c7 100644 (file)
--- a/servers/ext2/inode.c
+++ b/servers/ext2/inode.c
@@ -234,7 +234,7 @@ void put_inode(
        return;    /* checking here is easier than in caller */
 
   if (rip->i_count < 1)
-       panic("put_inode: i_count already below 1", rip->i_count);
+       panic("put_inode: i_count already below 1: %d", rip->i_count);
 
   if (--rip->i_count == 0) {    /* i_count == 0 means no one is using it now */
        if (rip->i_links_count == NO_LINK) {

diff --git a/servers/ext2/link.c b/servers/ext2/link.c
index 939d9e9c0f03e0e9a7397d77ba359da8fc22d2e5..831099b4cf3d3547aaff8380d2df80bc0809602e 100644 (file)
--- a/servers/ext2/link.c
+++ b/servers/ext2/link.c
@@ -718,7 +718,7 @@ off_t len;
        panic("zeroblock_range: no block");
   offset = pos % rip->i_sp->s_block_size;
   if (offset + len > rip->i_sp->s_block_size)
-       panic("zeroblock_range: len too long", len);
+       panic("zeroblock_range: len too long: %d", len);
   memset(b_data(bp) + offset, 0, len);
   lmfs_markdirty(bp);
   put_block(bp, FULL_DATA_BLOCK);

diff --git a/servers/ext2/open.c b/servers/ext2/open.c
index a2856733083fb83bdf95867f20523fbbc5202846..1096e09a36f06286d8e043107d4b49297a120ba5 100644 (file)
--- a/servers/ext2/open.c
+++ b/servers/ext2/open.c
@@ -171,7 +171,7 @@ int fs_mkdir()
          /* It was not possible to enter . or .. probably disk was full -
           * links counts haven't been touched. */
          if (search_dir(ldirp, lastc, NULL, DELETE, IGN_PERM, 0) != OK)
-                 panic("Dir disappeared ", rip->i_num);
+                 panic("Dir disappeared: %d ", rip->i_num);
          rip->i_links_count--; /* undo the increment done in new_node() */
   }
   rip->i_dirt = IN_DIRTY;              /* either way, i_links_count has changed */

diff --git a/servers/ext2/super.c b/servers/ext2/super.c
index 4c34af27d0ebb46a4251e9064b8227f5ad7718d1..27c455cdee3650ce697d629c01a69407955089f0 100644 (file)
--- a/servers/ext2/super.c
+++ b/servers/ext2/super.c
@@ -42,7 +42,7 @@ struct super_block *get_super(
   if (dev == NO_DEV)
        panic("request for super_block of NO_DEV");
   if (superblock->s_dev != dev)
-       panic("wrong superblock", (int) dev);
+       panic("wrong superblock: 0x%x", (int) dev);
 
   return(superblock);
 }

diff --git a/servers/procfs/tree.c b/servers/procfs/tree.c
index 5365ca20cf984f703ee80572a009d6e58aa4ff2f..239bd888d5db534dbe7ba68d72eeb5b72791d112 100644 (file)
--- a/servers/procfs/tree.c
+++ b/servers/procfs/tree.c
@@ -441,7 +441,7 @@ int lookup_hook(struct inode *parent, char *name,
         * Alternative: pull in only PM's table?
         */
        if ((r = getticks(&now)) != OK)
-               panic(__FILE__, "unable to get uptime", r);
+               panic("unable to get uptime: %d", r);
 
        if (last_update != now) {
                update_tables();

diff --git a/servers/vfs/filedes.c b/servers/vfs/filedes.c
index 1ccdb8eb93c934a4d2a6bee1a5b8c1d6aebf91f3..f0c3de8a943e08a6ad0644369b20abf632a788ab 100644 (file)
--- a/servers/vfs/filedes.c
+++ b/servers/vfs/filedes.c
@@ -673,7 +673,7 @@ struct filp *f;
        f->filp_mode = FILP_CLOSED;
        f->filp_count = 0;
   } else if (f->filp_count < 0) {
-       panic("VFS: invalid filp count: %d ino %d/%d", f->filp_count,
+       panic("VFS: invalid filp count: %d ino %d/%u", f->filp_count,
              vp->v_dev, vp->v_inode_nr);
   } else {
        unlock_vnode(f->filp_vno);

diff --git a/servers/vm/arch/i386/pagetable.c b/servers/vm/arch/i386/pagetable.c
index aa301ef1fb57d8778110cdea232181c265b93273..0f6cca9ceb4b10d23bc5218ea28d137f05119475 100644 (file)
--- a/servers/vm/arch/i386/pagetable.c
+++ b/servers/vm/arch/i386/pagetable.c
@@ -1147,9 +1147,9 @@ void pt_init(void)
                                kern_mappings[index].flags |= ARCH_VM_PTE_RO;
 #endif
                        if(addr % VM_PAGE_SIZE)
-                               panic("VM: addr unaligned: %d", addr);
+                               panic("VM: addr unaligned: %lu", addr);
                        if(len % VM_PAGE_SIZE)
-                               panic("VM: len unaligned: %d", len);
+                               panic("VM: len unaligned: %lu", len);
                        vir = offset;
                        if(sys_vmctl_reply_mapping(index, vir) != OK)
                                panic("VM: reply failed");