@@ -472,7 +472,7 @@ print_unknown_data(netdissect_options *ndo, const u_char *cp,
472
472
*/
473
473
static const char *
474
474
tok2strbuf (const struct tok * lp , const char * fmt ,
475
- u_int v , char * buf , size_t bufsize )
475
+ const u_int v , char * buf , const size_t bufsize )
476
476
{
477
477
if (lp != NULL ) {
478
478
while (lp -> s != NULL ) {
@@ -494,8 +494,7 @@ tok2strbuf(const struct tok *lp, const char *fmt,
494
494
* in round-robin fashion.
495
495
*/
496
496
const char *
497
- tok2str (const struct tok * lp , const char * fmt ,
498
- u_int v )
497
+ tok2str (const struct tok * lp , const char * fmt , const u_int v )
499
498
{
500
499
static char buf [4 ][TOKBUFSIZE ];
501
500
static int idx = 0 ;
@@ -516,7 +515,7 @@ tok2str(const struct tok *lp, const char *fmt,
516
515
*/
517
516
static char *
518
517
bittok2str_internal (const struct tok * lp , const char * fmt ,
519
- u_int v , const char * sep )
518
+ const u_int v , const char * sep )
520
519
{
521
520
static char buf [1024 + 1 ]; /* our string buffer */
522
521
char * bufp = buf ;
@@ -556,8 +555,7 @@ bittok2str_internal(const struct tok *lp, const char *fmt,
556
555
* this is useful for parsing bitfields, the output strings are not separated.
557
556
*/
558
557
char *
559
- bittok2str_nosep (const struct tok * lp , const char * fmt ,
560
- u_int v )
558
+ bittok2str_nosep (const struct tok * lp , const char * fmt , const u_int v )
561
559
{
562
560
return (bittok2str_internal (lp , fmt , v , "" ));
563
561
}
@@ -567,8 +565,7 @@ bittok2str_nosep(const struct tok *lp, const char *fmt,
567
565
* this is useful for parsing bitfields, the output strings are comma separated.
568
566
*/
569
567
char *
570
- bittok2str (const struct tok * lp , const char * fmt ,
571
- u_int v )
568
+ bittok2str (const struct tok * lp , const char * fmt , const u_int v )
572
569
{
573
570
return (bittok2str_internal (lp , fmt , v , ", " ));
574
571
}
@@ -580,8 +577,7 @@ bittok2str(const struct tok *lp, const char *fmt,
580
577
* correct for bounds-checking.
581
578
*/
582
579
const char *
583
- tok2strary_internal (const char * * lp , int n , const char * fmt ,
584
- int v )
580
+ tok2strary_internal (const char * * lp , int n , const char * fmt , const int v )
585
581
{
586
582
static char buf [TOKBUFSIZE ];
587
583
@@ -614,7 +610,7 @@ uint2tokary_internal(const struct uint_tokary dict[], const size_t size,
614
610
*/
615
611
616
612
int
617
- mask2plen (uint32_t mask )
613
+ mask2plen (const uint32_t mask )
618
614
{
619
615
const uint32_t bitmasks [33 ] = {
620
616
0x00000000 ,
@@ -682,7 +678,7 @@ mask62plen(const u_char *mask)
682
678
*/
683
679
static int
684
680
fetch_token (netdissect_options * ndo , const u_char * pptr , u_int idx , u_int len ,
685
- u_char * tbuf , size_t tbuflen )
681
+ u_char * tbuf , size_t tbuflen )
686
682
{
687
683
size_t toklen = 0 ;
688
684
u_char c ;
0 commit comments