Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 389 → Rev 390

/shark/trunk/kernel/printk.c
36,11 → 36,11
*/
 
/*
* CVS : $Id: printk.c,v 1.3 2004-01-08 20:14:08 giacomo Exp $
* CVS : $Id: printk.c,v 1.4 2004-01-08 21:15:35 giacomo Exp $
*
* File: $File$
* Revision: $Revision: 1.3 $
* Last update: $Date: 2004-01-08 20:14:08 $
* Revision: $Revision: 1.4 $
* Last update: $Date: 2004-01-08 21:15:35 $
*/
 
#include <ll/i386/cons.h>
70,6 → 70,7
static char buf[2048]; /* DANGER !!!!! */
SYS_FLAGS f;
int level;
int result;
level = NO_LEVEL;
if (*fmt == '<' && *(fmt+2) == '>')
81,7 → 82,8
if (level<=printklevel) return 0;
vsprintf(buf,(char*)fmt,ap);
result = vsprintf(buf,(char*)fmt,ap);
buf[result] = 0;
 
f=kern_fsave();
if (level != NO_LEVEL)
96,7 → 98,7
int printk(const char *fmt, ...)
{
va_list ap;
int res;
int res = 0;
va_start(ap, fmt);
res=vprintk(0,(char *)fmt, ap);
/shark/trunk/oslib/libc/ioformat/sprintf.c
214,10 → 214,7
parsing = 1;
}
break;
case '#': if (parsing != 1 && parsing != 2) {
*buf++ = '#';
scanned++;
}
case '#' : if (parsing != 1) parsing = 0;
break;
default : parsing = 0;
break;
/shark/trunk/drivers/net/3c59x.c
617,7 → 617,7
static int scanned=0;
if(scanned++)
return -ENODEV;
printk(KERN_INFO "%s", version);
//printk(KERN_INFO "%s", version);
return vortex_scan(dev, pci_tbl);
}
#endif /* not MODULE */