]>
Commit | Line | Data |
---|---|---|
23b45d1d | 1 | diff -up new/fs/davfs/dav_debug.h.orig new/fs/davfs/dav_debug.h |
2 | --- new/fs/davfs/dav_debug.h.orig 2002-08-09 22:38:28.000000000 +0200 | |
3 | +++ new/fs/davfs/dav_debug.h 2002-08-09 22:35:32.000000000 +0200 | |
4 | @@ -11,14 +11,14 @@ | |
5 | * these are normally enabled. | |
6 | */ | |
7 | #ifdef SMBFS_PARANOIA | |
8 | -#define PARANOIA(x...) printk(KERN_NOTICE __FUNCTION__ ": " x) | |
9 | +#define PARANOIA(fmt,args...) printk(KERN_NOTICE "%s: " fmt, __FUNCTION__, args) | |
10 | #else | |
11 | #define PARANOIA(x...) do { ; } while(0) | |
12 | #endif | |
13 | ||
14 | /* lots of debug messages */ | |
15 | #ifdef SMBFS_DEBUG_VERBOSE | |
16 | -#define VERBOSE(x...) printk(KERN_DEBUG __FUNCTION__ ": " x) | |
17 | +#define VERBOSE(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, args) | |
18 | #else | |
19 | #define VERBOSE(x...) do { ; } while(0) | |
20 | #endif | |
21 | @@ -28,19 +28,19 @@ | |
22 | * too common name. | |
23 | */ | |
24 | #ifdef SMBFS_TRACE | |
25 | -#define TRACE() printk(KERN_DEBUG __FUNCTION__ "--trace--\n") | |
26 | +#define TRACE() printk(KERN_DEBUG "%s--trace--\n", __FUNCTION__) | |
27 | #else | |
28 | #define TRACE() do { ; } while(0) | |
29 | #endif | |
30 | ||
31 | #ifdef SMBFS_DEBUG | |
32 | -#define DEBUG1(x...) printk(KERN_DEBUG __FUNCTION__ ": " x) | |
33 | +#define DEBUG1(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, args) | |
34 | #else | |
35 | #define DEBUG1(x...) do { ; } while(0) | |
36 | #endif | |
37 | ||
38 | #ifdef SMBFS_DEBUG2 | |
39 | -#define DEBUG2(x...) printk(KERN_DEBUG __FUNCTION__ ": " x) | |
40 | +#define DEBUG2(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, args) | |
41 | #else | |
42 | #define DEBUG2(x...) do { ; } while(0) | |
43 | #endif | |
44 | diff -ur linux-2.4.20/fs/davfs/proc.c linux-2.4.20.fpu/fs/davfs/proc.c | |
45 | --- linux-2.4.20/fs/davfs/proc.c Sun Mar 9 21:12:08 2003 | |
46 | +++ linux-2.4.20.fpu/fs/davfs/proc.c Sun Mar 9 21:05:33 2003 | |
47 | @@ -156,7 +156,7 @@ | |
48 | int dav_atoi(char *digit) { | |
49 | int ret=0; | |
50 | int i = (strlen(digit)-1); | |
51 | - double weight=1; | |
52 | + unsigned int weight=1; | |
53 | ||
54 | for(;i;i--) | |
55 | weight*=10; |