WebSVN - shark - Path Comparison - /shark Rev 390 and /shark Rev 389

Ignore whitespace Rev 390 → Rev 389

 /shark/trunk/oslib/libc/ioformat/sprintf.c
 ,7 → 214,10
                                parsing = 1;
                            }
                            break;
-                case '#' : if (parsing != 1) parsing = 0;
+                case '#':  if (parsing != 1 && parsing != 2) {
+                             *buf++ = '#';
+                             scanned++;
+                           }
                            break;
                 default :  parsing = 0;
                            break;

 /shark/trunk/drivers/net/3c59x.c
 ,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 */

 /shark/trunk/kernel/printk.c
 ,11 → 36,11
  */
 /*
- * CVS :        $Id: printk.c,v 1.4 2004-01-08 21:15:35 giacomo Exp $
+ * CVS :        $Id: printk.c,v 1.3 2004-01-08 20:14:08 giacomo Exp $
  *
  * File:        $File$
- * Revision:    $Revision: 1.4 $
- * Last update: $Date: 2004-01-08 21:15:35 $
+ * Revision:    $Revision: 1.3 $
+ * Last update: $Date: 2004-01-08 20:14:08 $
  */
 #include <ll/i386/cons.h>
 ,7 → 70,6
   static char buf[2048]; /* DANGER !!!!! */
   SYS_FLAGS f;
   int level;
-  int result;
   level = NO_LEVEL;
   if (*fmt == '<' && *(fmt+2) == '>')
 ,8 → 81,7
   if (level<=printklevel) return 0;
-  result = vsprintf(buf,(char*)fmt,ap);
-  buf[result] = 0;
+  vsprintf(buf,(char*)fmt,ap);
   f=kern_fsave();
   if (level != NO_LEVEL)
 ,7 → 96,7
 int printk(const char *fmt, ...)
 {
   va_list ap;
-  int res = 0;
+  int res;
   va_start(ap, fmt);
   res=vprintk(0,(char *)fmt, ap);