aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2008-01-31 07:09:00 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-31 22:27:47 -0500
commitdc64d02ba8559ed09f49697aedfb1f6a1ab5909d (patch)
treeddec4c45c63e3e7692f984420c7570ddd6434054
parentf4f6fb714f139f45f90c6a5048ee67f9960543f1 (diff)
[NETFILTER]: nf_conntrack_h3223: sparse fixes
Sparse complains when a function is not really static. Putting static on the function prototype is not enough. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/netfilter/nf_conntrack_h323_asn1.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c
index ff66fba514fd..f73e13041b5a 100644
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
@@ -126,7 +126,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level);
126 126
127/* Decoder Functions Vector */ 127/* Decoder Functions Vector */
128typedef int (*decoder_t) (bitstr_t *, field_t *, char *, int); 128typedef int (*decoder_t) (bitstr_t *, field_t *, char *, int);
129static decoder_t Decoders[] = { 129static const decoder_t Decoders[] = {
130 decode_nul, 130 decode_nul,
131 decode_bool, 131 decode_bool,
132 decode_oid, 132 decode_oid,
@@ -150,7 +150,7 @@ static decoder_t Decoders[] = {
150 * Functions 150 * Functions
151 ****************************************************************************/ 151 ****************************************************************************/
152/* Assume bs is aligned && v < 16384 */ 152/* Assume bs is aligned && v < 16384 */
153unsigned get_len(bitstr_t * bs) 153static unsigned get_len(bitstr_t * bs)
154{ 154{
155 unsigned v; 155 unsigned v;
156 156
@@ -166,7 +166,7 @@ unsigned get_len(bitstr_t * bs)
166} 166}
167 167
168/****************************************************************************/ 168/****************************************************************************/
169unsigned get_bit(bitstr_t * bs) 169static unsigned get_bit(bitstr_t * bs)
170{ 170{
171 unsigned b = (*bs->cur) & (0x80 >> bs->bit); 171 unsigned b = (*bs->cur) & (0x80 >> bs->bit);
172 172
@@ -177,7 +177,7 @@ unsigned get_bit(bitstr_t * bs)
177 177
178/****************************************************************************/ 178/****************************************************************************/
179/* Assume b <= 8 */ 179/* Assume b <= 8 */
180unsigned get_bits(bitstr_t * bs, unsigned b) 180static unsigned get_bits(bitstr_t * bs, unsigned b)
181{ 181{
182 unsigned v, l; 182 unsigned v, l;
183 183
@@ -203,7 +203,7 @@ unsigned get_bits(bitstr_t * bs, unsigned b)
203 203
204/****************************************************************************/ 204/****************************************************************************/
205/* Assume b <= 32 */ 205/* Assume b <= 32 */
206unsigned get_bitmap(bitstr_t * bs, unsigned b) 206static unsigned get_bitmap(bitstr_t * bs, unsigned b)
207{ 207{
208 unsigned v, l, shift, bytes; 208 unsigned v, l, shift, bytes;
209 209
@@ -242,7 +242,7 @@ unsigned get_bitmap(bitstr_t * bs, unsigned b)
242/**************************************************************************** 242/****************************************************************************
243 * Assume bs is aligned and sizeof(unsigned int) == 4 243 * Assume bs is aligned and sizeof(unsigned int) == 4
244 ****************************************************************************/ 244 ****************************************************************************/
245unsigned get_uint(bitstr_t * bs, int b) 245static unsigned get_uint(bitstr_t * bs, int b)
246{ 246{
247 unsigned v = 0; 247 unsigned v = 0;
248 248
@@ -264,7 +264,7 @@ unsigned get_uint(bitstr_t * bs, int b)
264} 264}
265 265
266/****************************************************************************/ 266/****************************************************************************/
267int decode_nul(bitstr_t * bs, field_t * f, char *base, int level) 267static int decode_nul(bitstr_t * bs, field_t * f, char *base, int level)
268{ 268{
269 PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); 269 PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
270 270
@@ -272,7 +272,7 @@ int decode_nul(bitstr_t * bs, field_t * f, char *base, int level)
272} 272}
273 273
274/****************************************************************************/ 274/****************************************************************************/
275int decode_bool(bitstr_t * bs, field_t * f, char *base, int level) 275static int decode_bool(bitstr_t * bs, field_t * f, char *base, int level)
276{ 276{
277 PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); 277 PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
278 278
@@ -283,7 +283,7 @@ int decode_bool(bitstr_t * bs, field_t * f, char *base, int level)
283} 283}
284 284
285/****************************************************************************/ 285/****************************************************************************/
286int decode_oid(bitstr_t * bs, field_t * f, char *base, int level) 286static int decode_oid(bitstr_t * bs, field_t * f, char *base, int level)
287{ 287{
288 int len; 288 int len;
289 289
@@ -299,7 +299,7 @@ int decode_oid(bitstr_t * bs, field_t * f, char *base, int level)
299} 299}
300 300
301/****************************************************************************/ 301/****************************************************************************/
302int decode_int(bitstr_t * bs, field_t * f, char *base, int level) 302static int decode_int(bitstr_t * bs, field_t * f, char *base, int level)
303{ 303{
304 unsigned len; 304 unsigned len;
305 305
@@ -342,7 +342,7 @@ int decode_int(bitstr_t * bs, field_t * f, char *base, int level)
342} 342}
343 343
344/****************************************************************************/ 344/****************************************************************************/
345int decode_enum(bitstr_t * bs, field_t * f, char *base, int level) 345static int decode_enum(bitstr_t * bs, field_t * f, char *base, int level)
346{ 346{
347 PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); 347 PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
348 348
@@ -357,7 +357,7 @@ int decode_enum(bitstr_t * bs, field_t * f, char *base, int level)
357} 357}
358 358
359/****************************************************************************/ 359/****************************************************************************/
360int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level) 360static int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level)
361{ 361{
362 unsigned len; 362 unsigned len;
363 363
@@ -390,7 +390,7 @@ int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level)
390} 390}
391 391
392/****************************************************************************/ 392/****************************************************************************/
393int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level) 393static int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level)
394{ 394{
395 unsigned len; 395 unsigned len;
396 396
@@ -407,7 +407,7 @@ int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level)
407} 407}
408 408
409/****************************************************************************/ 409/****************************************************************************/
410int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level) 410static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level)
411{ 411{
412 unsigned len; 412 unsigned len;
413 413
@@ -455,7 +455,7 @@ int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level)
455} 455}
456 456
457/****************************************************************************/ 457/****************************************************************************/
458int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level) 458static int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level)
459{ 459{
460 unsigned len; 460 unsigned len;
461 461
@@ -480,7 +480,7 @@ int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level)
480} 480}
481 481
482/****************************************************************************/ 482/****************************************************************************/
483int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) 483static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
484{ 484{
485 unsigned ext, bmp, i, opt, len = 0, bmp2, bmp2_len; 485 unsigned ext, bmp, i, opt, len = 0, bmp2, bmp2_len;
486 int err; 486 int err;
@@ -596,7 +596,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
596} 596}
597 597
598/****************************************************************************/ 598/****************************************************************************/
599int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level) 599static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
600{ 600{
601 unsigned count, effective_count = 0, i, len = 0; 601 unsigned count, effective_count = 0, i, len = 0;
602 int err; 602 int err;
@@ -685,7 +685,7 @@ int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
685 685
686 686
687/****************************************************************************/ 687/****************************************************************************/
688int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) 688static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
689{ 689{
690 unsigned type, ext, len = 0; 690 unsigned type, ext, len = 0;
691 int err; 691 int err;