This patch removes typedefs from struct and renames it from "typedef struct
bitstr_t" to "struct bitstr" as per kernel coding standards."
Signed-off-by: Arushi Singhal
---
net/netfilter/nf_conntrack_h323_asn1.c | 80 +-
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/net/netfilter/nf_conntrack_h323_asn1.c
b/net/netfilter/nf_conntrack_h323_asn1.c
index fb8cf238a76f..4502c0d6071d 100644
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
@@ -91,41 +91,41 @@ struct field {
};
/* Bit Stream */
-typedef struct {
+struct bitstr {
unsigned char *buf;
unsigned char *beg;
unsigned char *end;
unsigned char *cur;
unsigned int bit;
-} bitstr_t;
+};
/* Tool Functions */
#define INC_BIT(bs) if((++(bs)->bit)>7){(bs)->cur++;(bs)->bit=0;}
#define INC_BITS(bs,b)
if(((bs)->bit+=(b))>7){(bs)->cur+=(bs)->bit>>3;(bs)->bit&=7;}
#define BYTE_ALIGN(bs) if((bs)->bit){(bs)->cur++;(bs)->bit=0;}
#define CHECK_BOUND(bs,n) if((bs)->cur+(n)>(bs)->end)return(H323_ERROR_BOUND)
-static unsigned int get_len(bitstr_t *bs);
-static unsigned int get_bit(bitstr_t *bs);
-static unsigned int get_bits(bitstr_t *bs, unsigned int b);
-static unsigned int get_bitmap(bitstr_t *bs, unsigned int b);
-static unsigned int get_uint(bitstr_t *bs, int b);
+static unsigned int get_len(struct bitstr *bs);
+static unsigned int get_bit(struct bitstr *bs);
+static unsigned int get_bits(struct bitstr *bs, unsigned int b);
+static unsigned int get_bitmap(struct bitstr *bs, unsigned int b);
+static unsigned int get_uint(struct bitstr *bs, int b);
/* Decoder Functions */
-static int decode_nul(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_bool(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_oid(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_int(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_enum(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_bitstr(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_numstr(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_octstr(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_bmpstr(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_seq(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_seqof(bitstr_t *bs, const struct field *f, char *base, int
level);
-static int decode_choice(bitstr_t *bs, const struct field *f, char *base, int
level);
+static int decode_nul(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_bool(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_oid(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_int(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_enum(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_bitstr(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_numstr(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_octstr(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_bmpstr(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_seq(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_seqof(struct bitstr *bs, const struct field *f, char *base,
int level);
+static int decode_choice(struct bitstr *bs, const struct field *f, char *base,
int level);
/* Decoder Functions Vector */
-typedef int (*decoder_t)(bitstr_t *, const struct field *, char *, int);
+typedef int (*decoder_t)(struct bitstr *, const struct field *, char *, int);
static const decoder_t Decoders[] = {
decode_nul,
decode_bool,
@@ -150,7 +150,7 @@ static const decoder_t Decoders[] = {
* Functions
/
/* Assume bs is aligned && v < 16384 */
-static unsigned int get_len(bitstr_t *bs)
+static unsigned int get_len(struct bitstr *bs)
{
unsigned int v;
@@ -166,7 +166,7 @@ static unsigned int get_len(bitstr_t *bs)
}
//
-static unsigned int get_bit(bitstr_t *bs)
+static unsigned int get_bit(struct bitstr *bs)
{
unsigned int b = (*bs->cur) & (0x80 >> bs->bit);
@@ -177,7 +177,7 @@ static unsigned int get_bit(bitstr_t *bs)
//
/* Assume b <= 8 */
-static unsigned int get_bits(bitstr_t *bs, unsigned int b)
+static unsigned int get_bits(struct