lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: nf_conntrack_h3223: sparse fixes

Browse Source 
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>
This commit is contained in:
Stephen Hemminger
2008-01-31 04:09:00 -08:00
committed by David S. Miller
parent f4f6fb714f
commit dc64d02ba8
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
net/netfilter/nf_conntrack_h323_asn1.c
View File

@@ -126,7 +126,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level);
/* Decoder Functions Vector */ /* Decoder Functions Vector */
typedef int (*decoder_t) (bitstr_t *, field_t *, char *, int); typedef int (*decoder_t) (bitstr_t *, field_t *, char *, int);
static decoder_t Decoders[] = { static const decoder_t Decoders[] = {
decode_nul, decode_nul,
decode_bool, decode_bool,
decode_oid, decode_oid,
@@ -150,7 +150,7 @@ static decoder_t Decoders[] = {
* Functions * Functions
****************************************************************************/ ****************************************************************************/
/* Assume bs is aligned && v < 16384 */ /* Assume bs is aligned && v < 16384 */
unsigned get_len(bitstr_t * bs) static unsigned get_len(bitstr_t * bs)
{ {
unsigned v; unsigned v;
@@ -166,7 +166,7 @@ unsigned get_len(bitstr_t * bs)
} }
/****************************************************************************/ /****************************************************************************/
unsigned get_bit(bitstr_t * bs) static unsigned get_bit(bitstr_t * bs)
{ {
unsigned b = (*bs->cur) & (0x80 >> bs->bit); unsigned b = (*bs->cur) & (0x80 >> bs->bit);
@@ -177,7 +177,7 @@ unsigned get_bit(bitstr_t * bs)
/****************************************************************************/ /****************************************************************************/
/* Assume b <= 8 */ /* Assume b <= 8 */
unsigned get_bits(bitstr_t * bs, unsigned b) static unsigned get_bits(bitstr_t * bs, unsigned b)
{ {
unsigned v, l; unsigned v, l;
@@ -203,7 +203,7 @@ unsigned get_bits(bitstr_t * bs, unsigned b)
/****************************************************************************/ /****************************************************************************/
/* Assume b <= 32 */ /* Assume b <= 32 */
unsigned get_bitmap(bitstr_t * bs, unsigned b) static unsigned get_bitmap(bitstr_t * bs, unsigned b)
{ {
unsigned v, l, shift, bytes; unsigned v, l, shift, bytes;
@@ -242,7 +242,7 @@ unsigned get_bitmap(bitstr_t * bs, unsigned b)
/**************************************************************************** /****************************************************************************
* Assume bs is aligned and sizeof(unsigned int) == 4 * Assume bs is aligned and sizeof(unsigned int) == 4
****************************************************************************/ ****************************************************************************/
unsigned get_uint(bitstr_t * bs, int b) static unsigned get_uint(bitstr_t * bs, int b)
{ {
unsigned v = 0; unsigned v = 0;
@@ -264,7 +264,7 @@ unsigned get_uint(bitstr_t * bs, int b)
} }
/****************************************************************************/ /****************************************************************************/
int decode_nul(bitstr_t * bs, field_t * f, char *base, int level) static int decode_nul(bitstr_t * bs, field_t * f, char *base, int level)
{ {
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
@@ -272,7 +272,7 @@ int decode_nul(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_bool(bitstr_t * bs, field_t * f, char *base, int level) static int decode_bool(bitstr_t * bs, field_t * f, char *base, int level)
{ {
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
@@ -283,7 +283,7 @@ int decode_bool(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_oid(bitstr_t * bs, field_t * f, char *base, int level) static int decode_oid(bitstr_t * bs, field_t * f, char *base, int level)
{ {
int len; int len;
@@ -299,7 +299,7 @@ int decode_oid(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_int(bitstr_t * bs, field_t * f, char *base, int level) static int decode_int(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned len; unsigned len;
@@ -342,7 +342,7 @@ int decode_int(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_enum(bitstr_t * bs, field_t * f, char *base, int level) static int decode_enum(bitstr_t * bs, field_t * f, char *base, int level)
{ {
PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name); PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
@@ -357,7 +357,7 @@ int decode_enum(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned len; unsigned len;
@@ -390,7 +390,7 @@ int decode_bitstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned len; unsigned len;
@@ -407,7 +407,7 @@ int decode_numstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned len; unsigned len;
@@ -455,7 +455,7 @@ int decode_octstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level) static int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned len; unsigned len;
@@ -480,7 +480,7 @@ int decode_bmpstr(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_seq(bitstr_t * bs, field_t * f, char *base, int level) static int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned ext, bmp, i, opt, len = 0, bmp2, bmp2_len; unsigned ext, bmp, i, opt, len = 0, bmp2, bmp2_len;
int err; int err;
@@ -596,7 +596,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
} }
/****************************************************************************/ /****************************************************************************/
int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level) static int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned count, effective_count = 0, i, len = 0; unsigned count, effective_count = 0, i, len = 0;
int err; int err;
@@ -685,7 +685,7 @@ int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
/****************************************************************************/ /****************************************************************************/
int decode_choice(bitstr_t * bs, field_t * f, char *base, int level) static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
{ {
unsigned type, ext, len = 0; unsigned type, ext, len = 0;
int err; int err;