]>
Commit | Line | Data |
---|---|---|
a10ae6cc MT |
1 | diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-2.4.1/src/ilmid/atmf_uni.c |
2 | --- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c 2001-09-03 19:41:06.000000000 +0100 | |
3 | +++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2005-08-13 10:22:44.000000000 +0100 | |
4 | @@ -187,7 +187,7 @@ | |
5 | newPrefix->name = alloc_t(AsnOid); | |
6 | newPrefix->name->octs = alloc(varBindName->octetLen); | |
7 | AsnOidCopy(newPrefix->name, varBindName); | |
8 | - Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix); | |
9 | + Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix); | |
10 | if(atmNetPrefix.octs == NULL) | |
11 | { | |
12 | atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2; | |
13 | @@ -197,7 +197,7 @@ | |
14 | } | |
15 | else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) | |
16 | { | |
17 | - Q_REMOVE((NetPrefixNode *) var->value, prefix); | |
18 | + Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix); | |
19 | } | |
20 | ||
21 | return NOERROR; | |
22 | diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-2.4.1/src/lib/sapequal.c | |
23 | --- linux-atm-2.4.1-orig/src/lib/sapequal.c 2001-09-03 19:41:05.000000000 +0100 | |
24 | +++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000 +0000 | |
25 | @@ -65,6 +65,7 @@ | |
26 | CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window); | |
27 | break; | |
28 | default: | |
29 | + ; | |
30 | } | |
31 | switch (a.l3_proto) { | |
32 | case ATM_L3_X25: | |
33 | @@ -83,6 +84,7 @@ | |
34 | if (a.l3.user != b.l3.user) return 0; | |
35 | break; | |
36 | default: | |
37 | + ; | |
38 | } | |
39 | return 1; | |
40 | } | |
41 | diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-2.4.1/src/maint/atmtcp.c | |
42 | --- linux-atm-2.4.1-orig/src/maint/atmtcp.c 2001-09-03 19:41:06.000000000 +0100 | |
43 | +++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000 +0100 | |
44 | @@ -60,7 +60,7 @@ | |
45 | static IN *inputs = NULL; | |
46 | static fd_set in_set; | |
47 | static int fds = 0; | |
48 | -static int debug = 0; | |
49 | +int debug = 0; | |
50 | static int links = 0; | |
51 | ||
52 | ||
53 | diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-2.4.1/src/maint/enitune.c | |
54 | --- linux-atm-2.4.1-orig/src/maint/enitune.c 2001-09-03 19:41:06.000000000 +0100 | |
55 | +++ linux-atm-2.4.1/src/maint/enitune.c 2005-02-06 19:24:37.000000000 +0000 | |
56 | @@ -44,6 +44,7 @@ | |
57 | if (*end || mult.rx <= 100) usage(name); | |
58 | break; | |
59 | default: | |
60 | + ; | |
61 | } | |
62 | if (argc != optind+1) usage(name); | |
63 | sioc.number = strtol(argv[optind],&end,0); | |
64 | diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c | |
65 | --- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03 19:41:06.000000000 +0100 | |
66 | +++ linux-atm-2.4.1/src/mpoad/p_factory.c 2005-08-13 10:22:44.000000000 +0100 | |
67 | @@ -31,16 +31,17 @@ | |
68 | * beginning at location "addr". | |
69 | */ | |
70 | uint32_t sum = 0; | |
71 | + uint16_t *addr16 = addr; | |
72 | ||
73 | while( count > 1 ) { | |
74 | /* This is the inner loop */ | |
75 | - sum += * ((uint16_t *) addr)++; | |
76 | + sum += * addr16++; | |
77 | count -= 2; | |
78 | } | |
79 | ||
80 | /* Add left-over byte, if any */ | |
81 | if( count > 0 ) | |
82 | - sum += * (unsigned char *) addr; | |
83 | + sum += * (unsigned char *) addr16; | |
84 | ||
85 | /* Fold 32-bit sum to 16 bits */ | |
86 | while (sum>>16) | |
87 | diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-2.4.1/src/qgen/qlib.c | |
88 | --- linux-atm-2.4.1-orig/src/qgen/qlib.c 2001-09-03 19:41:05.000000000 +0100 | |
89 | +++ linux-atm-2.4.1/src/qgen/qlib.c 2005-08-13 10:22:44.000000000 +0100 | |
90 | @@ -26,8 +26,6 @@ | |
91 | #include "op.h" | |
92 | ||
93 | ||
94 | -static int debug = 0; | |
95 | - | |
96 | ||
97 | void PREFIX(report)(int severity,const char *msg,...) | |
98 | { | |
99 | @@ -830,6 +828,8 @@ | |
100 | ||
101 | #ifdef STANDALONE | |
102 | ||
103 | +int debug = 0; | |
104 | + | |
105 | int main(int argc,const char **argv) | |
106 | { | |
107 | unsigned char msg[5000]; /* should be large enough for that */ | |
108 | diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-2.4.1/src/qgen/qlib.h | |
109 | --- linux-atm-2.4.1-orig/src/qgen/qlib.h 2001-09-03 19:41:05.000000000 +0100 | |
110 | +++ linux-atm-2.4.1/src/qgen/qlib.h 2005-08-13 10:22:44.000000000 +0100 | |
111 | @@ -23,7 +23,6 @@ | |
112 | #define Q_FATAL -1 | |
113 | ||
114 | ||
115 | -extern int q_dump; | |
116 | extern void q_report(int severity,const char *msg,...); | |
117 | ||
118 | #ifdef DUMP_MODE | |
119 | diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-2.4.1/src/sigd/proto.c | |
120 | --- linux-atm-2.4.1-orig/src/sigd/proto.c 2001-09-03 19:41:06.000000000 +0100 | |
121 | +++ linux-atm-2.4.1/src/sigd/proto.c 2005-02-06 19:24:37.000000000 +0000 | |
122 | @@ -259,6 +259,7 @@ | |
123 | break; | |
124 | } | |
125 | default: | |
126 | + ; | |
127 | } | |
128 | va_end(ap); | |
129 | if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size); | |
130 | @@ -288,6 +289,7 @@ | |
131 | } | |
132 | break; | |
133 | default: | |
134 | + ; | |
135 | } | |
136 | va_end(ap); | |
137 | } | |
138 | diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-2.4.1/src/switch/debug/debug.c | |
139 | --- linux-atm-2.4.1-orig/src/switch/debug/debug.c 2001-09-03 19:41:06.000000000 +0100 | |
140 | +++ linux-atm-2.4.1/src/switch/debug/debug.c 2005-08-13 10:22:44.000000000 +0100 | |
141 | @@ -18,7 +18,7 @@ | |
142 | #define COMPONENT "FAB(debug)" | |
143 | ||
144 | ||
145 | -#define PRV(call) ((FAB *) (call)->fab) | |
146 | +#define PRV(call) (*((FAB **) &(call)->fab)) | |
147 | ||
148 | ||
149 | typedef struct _fab { | |
150 | diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-2.4.1/src/switch/tcp/tcpsw.c | |
151 | --- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c 2001-09-03 19:41:06.000000000 +0100 | |
152 | +++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2005-08-13 10:22:44.000000000 +0100 | |
153 | @@ -27,7 +27,7 @@ | |
154 | ||
155 | #define COMPONENT "FAB(tcp)" | |
156 | ||
157 | -#define PRV(call) ((FAB *) (call)->fab) | |
158 | +#define PRV(call) (*((FAB **) &(call)->fab)) | |
159 | ||
160 | #define MAX_VCI 1024 | |
161 |