Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
net-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
net-tools
Commits
70c3a90b
Commit
70c3a90b
authored
Aug 29, 2015
by
Mike Frysinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
statistics: constify tables
parent
c58d03b8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
statistics.c
statistics.c
+12
-11
No files found.
statistics.c
View file @
70c3a90b
...
@@ -33,7 +33,7 @@ struct statedesc {
...
@@ -33,7 +33,7 @@ struct statedesc {
const
char
*
title
;
const
char
*
title
;
};
};
static
struct
statedesc
states
[]
=
{
static
const
struct
statedesc
states
[]
=
{
[
number
]
=
{
4
,
NULL
},
[
number
]
=
{
4
,
NULL
},
[
opt_number
]
=
{
4
,
NULL
},
[
opt_number
]
=
{
4
,
NULL
},
[
i_forward
]
=
{
4
,
NULL
},
[
i_forward
]
=
{
4
,
NULL
},
...
@@ -298,7 +298,7 @@ struct tabtab {
...
@@ -298,7 +298,7 @@ struct tabtab {
int
*
flag
;
int
*
flag
;
};
};
static
struct
tabtab
snmptabs
[]
=
static
const
struct
tabtab
snmptabs
[]
=
{
{
{
"Ip"
,
Iptab
,
sizeof
(
Iptab
),
&
f_raw
},
{
"Ip"
,
Iptab
,
sizeof
(
Iptab
),
&
f_raw
},
{
"Icmp"
,
Icmptab
,
sizeof
(
Icmptab
),
&
f_raw
},
{
"Icmp"
,
Icmptab
,
sizeof
(
Icmptab
),
&
f_raw
},
...
@@ -308,7 +308,7 @@ static struct tabtab snmptabs[] =
...
@@ -308,7 +308,7 @@ static struct tabtab snmptabs[] =
{
NULL
}
{
NULL
}
};
};
static
struct
tabtab
snmp6tabs
[]
=
static
const
struct
tabtab
snmp6tabs
[]
=
{
{
{
"Ip6"
,
Ip6tab
,
sizeof
(
Ip6tab
),
&
f_raw
},
{
"Ip6"
,
Ip6tab
,
sizeof
(
Ip6tab
),
&
f_raw
},
{
"Icmp6"
,
Icmp6tab
,
sizeof
(
Icmp6tab
),
&
f_raw
},
{
"Icmp6"
,
Icmp6tab
,
sizeof
(
Icmp6tab
),
&
f_raw
},
...
@@ -324,7 +324,7 @@ static int cmpentries(const void *a, const void *b)
...
@@ -324,7 +324,7 @@ static int cmpentries(const void *a, const void *b)
return
strcmp
(((
struct
entry
*
)
a
)
->
title
,
((
struct
entry
*
)
b
)
->
title
);
return
strcmp
(((
struct
entry
*
)
a
)
->
title
,
((
struct
entry
*
)
b
)
->
title
);
}
}
static
void
printval
(
struct
tabtab
*
tab
,
const
char
*
title
,
unsigned
long
long
val
)
static
void
printval
(
const
struct
tabtab
*
tab
,
const
char
*
title
,
unsigned
long
long
val
)
{
{
struct
entry
*
ent
=
NULL
,
key
;
struct
entry
*
ent
=
NULL
,
key
;
int
type
;
int
type
;
...
@@ -382,9 +382,9 @@ static void printval(struct tabtab *tab, const char *title, unsigned long long v
...
@@ -382,9 +382,9 @@ static void printval(struct tabtab *tab, const char *title, unsigned long long v
state
=
type
;
state
=
type
;
}
}
static
struct
tabtab
*
newtable
(
struct
tabtab
*
tabs
,
const
char
*
title
)
static
const
struct
tabtab
*
newtable
(
const
struct
tabtab
*
tabs
,
const
char
*
title
)
{
{
struct
tabtab
*
t
;
const
struct
tabtab
*
t
;
static
struct
tabtab
dummytab
;
static
struct
tabtab
dummytab
;
for
(
t
=
tabs
;
t
->
title
;
t
++
)
{
for
(
t
=
tabs
;
t
->
title
;
t
++
)
{
...
@@ -409,7 +409,7 @@ static int process_fd(FILE *f, int all, const char *filter)
...
@@ -409,7 +409,7 @@ static int process_fd(FILE *f, int all, const char *filter)
char
*
sp
,
*
np
,
*
p
;
char
*
sp
,
*
np
,
*
p
;
while
(
fgets
(
buf1
,
sizeof
buf1
,
f
))
{
while
(
fgets
(
buf1
,
sizeof
buf1
,
f
))
{
int
endflag
;
int
endflag
;
struct
tabtab
*
tab
;
const
struct
tabtab
*
tab
;
if
(
buf1
[
0
]
==
'\n'
)
// skip empty first line in 2.6 kernels
if
(
buf1
[
0
]
==
'\n'
)
// skip empty first line in 2.6 kernels
continue
;
continue
;
...
@@ -474,7 +474,7 @@ static void process6_fd(FILE *f)
...
@@ -474,7 +474,7 @@ static void process6_fd(FILE *f)
{
{
char
buf1
[
1024
],
buf2
[
50
],
buf3
[
1024
];
char
buf1
[
1024
],
buf2
[
50
],
buf3
[
1024
];
unsigned
long
long
val
;
unsigned
long
long
val
;
struct
tabtab
*
tab
=
NULL
;
const
struct
tabtab
*
tab
=
NULL
;
int
cpflg
=
0
;
int
cpflg
=
0
;
while
(
fgets
(
buf1
,
sizeof
buf1
,
f
))
{
while
(
fgets
(
buf1
,
sizeof
buf1
,
f
))
{
...
@@ -558,17 +558,18 @@ void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
...
@@ -558,17 +558,18 @@ void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
void
inittab
(
void
)
void
inittab
(
void
)
{
{
struct
tabtab
*
t
;
const
struct
tabtab
*
t
;
/* we sort at runtime because I'm lazy ;) */
/* we sort at runtime because I'm lazy ;) */
for
(
t
=
snmptabs
;
t
->
title
;
t
++
)
for
(
t
=
snmptabs
;
t
->
title
;
t
++
)
{
qsort
(
t
->
tab
,
t
->
size
/
sizeof
(
struct
entry
),
qsort
(
t
->
tab
,
t
->
size
/
sizeof
(
struct
entry
),
sizeof
(
struct
entry
),
cmpentries
);
sizeof
(
struct
entry
),
cmpentries
);
}
}
}
void
inittab6
(
void
)
void
inittab6
(
void
)
{
{
struct
tabtab
*
t
;
const
struct
tabtab
*
t
;
for
(
t
=
snmp6tabs
;
t
->
title
;
t
++
)
for
(
t
=
snmp6tabs
;
t
->
title
;
t
++
)
qsort
(
t
->
tab
,
t
->
size
/
sizeof
(
struct
entry
),
qsort
(
t
->
tab
,
t
->
size
/
sizeof
(
struct
entry
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment