sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed some incorrect uses of printf-like functions.

Browse source
This commit is contained in:
Kees van Reeuwijk 2010-04-01 14:30:36 +00:00
parent fc7dced1fa
commit 0a04f49d2b
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/at_wini/at_wini.c
View file

@ -2556,7 +2556,7 @@ PRIVATE int at_in(int line, u32_t port, u32_t *value,
if(s == OK)
return OK;
printf("at_wini%d: line %d: %s failed: %d; port %x\n",
w_instance, line, typename, s, value, port);
w_instance, line, typename, s, port);
panic("sys_in failed");
}

10
drivers/audio/common/audio_fw.c
View file

@ -245,7 +245,7 @@ PRIVATE int init_driver(void) {
/* ...and register interrupt vector */
if ((i=sys_irqsetpolicy(irq, 0, &irq_hook_id )) != OK){
error("%s: init driver couldn't set IRQ policy", drv.DriverName, i);
error("%s: init driver couldn't set IRQ policy: %d", drv.DriverName, i);
return EIO;
}
irq_hook_set = TRUE; /* now signal handler knows it must unregister policy*/
@ -297,19 +297,19 @@ PRIVATE int msg_open (int minor_dev_nr) {
io_ctl = special_file_ptr->io_ctl;
if (read_chan==NO_CHANNEL && write_chan==NO_CHANNEL && io_ctl==NO_CHANNEL) {
error("%s: No channel specified for minor device!\n",
error("%s: No channel specified for minor device %d!\n",
drv.DriverName, minor_dev_nr);
return EIO;
}
if (read_chan == write_chan && read_chan != NO_CHANNEL) {
error("%s: Read and write channels are equal!\n",
error("%s: Read and write channels are equal: %d!\n",
drv.DriverName, minor_dev_nr);
return EIO;
}
/* init driver */
if (!device_available) {
if (init_driver() != OK) {
error("%s: Couldn't init driver!\n", drv.DriverName, minor_dev_nr);
error("%s: Couldn't init driver!\n", drv.DriverName);
return EIO;
} else {
device_available = TRUE;
@ -515,7 +515,7 @@ PRIVATE void msg_write(const message *m_ptr)
if (!sub_dev_ptr->DmaBusy) { /* get fragment size on first write */
if (drv_get_frag_size(&(sub_dev_ptr->FragSize), sub_dev_ptr->Nr) != OK){
error("%s; Failed to get fragment size!\n", drv.DriverName, 0);
error("%s; Failed to get fragment size!\n", drv.DriverName);
return;
}
}

2
kernel/arch/i386/breakpoints.c
View file

@ -47,7 +47,7 @@ printf("ld_dr7(0x%x)\n",dr7);
case 1: ld_dr1(linaddr); break;
case 2: ld_dr2(linaddr); break;
case 3: ld_dr3(linaddr); break;
default: panic(__FILE__, "invalid breakpoint index", __LINE__);
default: panic("%s:%d: invalid breakpoint index", __FILE__, __LINE__);
}
printf("ld_dr%d(0x%x)\n",bp,linaddr);

4
lib/libsys/sef_signal.c
View file

@ -34,7 +34,7 @@ PRIVATE void process_sigmgr_signals(void)
while (TRUE) {
/* Get an arbitrary pending signal. */
if((r=sys_getksig(&target, &sigset)) != OK)
panic("SEF", "sys_getksig failed", r);
panic("SEF: sys_getksig failed: %d", r);
if (target == NONE) {
/* Stop if there are no more pending signals. */
@ -56,7 +56,7 @@ PRIVATE void process_sigmgr_signals(void)
/* Tell the kernel we are done if the target is still alive. */
if(r == OK) {
if((r=sys_endksig(target)) != OK)
panic("SEF","sys_endksig failed", r);
panic("SEF: sys_endksig failed :%d", r);
}
}
}