提交 dc64d02b 编写于 作者: S Stephen Hemminger 提交者: David S. Miller

[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: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f4f6fb71
......@@ -126,7 +126,7 @@ static int decode_choice(bitstr_t * bs, field_t * f, char *base, int level);
/* Decoder Functions Vector */
typedef int (*decoder_t) (bitstr_t *, field_t *, char *, int);
static decoder_t Decoders[] = {
static const decoder_t Decoders[] = {
decode_nul,
decode_bool,
decode_oid,
......@@ -150,7 +150,7 @@ static decoder_t Decoders[] = {
* Functions
****************************************************************************/
/* Assume bs is aligned && v < 16384 */
unsigned get_len(bitstr_t * bs)
static unsigned get_len(bitstr_t * bs)
{
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);
......@@ -177,7 +177,7 @@ unsigned get_bit(bitstr_t * bs)
/****************************************************************************/
/* Assume b <= 8 */
unsigned get_bits(bitstr_t * bs, unsigned b)
static unsigned get_bits(bitstr_t * bs, unsigned b)
{
unsigned v, l;
......@@ -203,7 +203,7 @@ unsigned get_bits(bitstr_t * bs, unsigned b)
/****************************************************************************/
/* 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;
......@@ -242,7 +242,7 @@ unsigned get_bitmap(bitstr_t * bs, unsigned b)
/****************************************************************************
* 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;
......@@ -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);
......@@ -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);
......@@ -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;
......@@ -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;
......@@ -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);
......@@ -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;
......@@ -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;
......@@ -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;
......@@ -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;
......@@ -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;
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;
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;
int err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册