matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ematch warnings with GCC4.0

This commit is contained in:
shemminger 2005-07-14 16:49:27 +00:00
parent 737f15f6da
commit 3fcdebb6d0
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,6 +1,10 @@
2005-07-05 Thomas Graf <tgraf@suug.ch> 2005-07-14 Thomas Graf <tgraf@suug.ch>
* Build check for GNU Bison * Make ematch bison/lex build with common flex
2005-07-10 Stephen Hemminger <shemminger@osdl.org>
* Fix Gcc 4.0 build warnings signed/unsigned
2005-06-23 Jamal Hadi Salim <hadi@znyx.com> 2005-06-23 Jamal Hadi Salim <hadi@znyx.com>

18
tc/emp_ematch.l
View File

@ -35,14 +35,8 @@
static void __attribute__ ((unused)) yy_push_state (int new_state ); static void __attribute__ ((unused)) yy_push_state (int new_state );
static void __attribute__ ((unused)) yy_pop_state (void); static void __attribute__ ((unused)) yy_pop_state (void);
static int __attribute__ ((unused)) yy_top_state (void ); static int __attribute__ ((unused)) yy_top_state (void );
%}
%x str static char *strbuf;
%option 8bit stack warn noyywrap prefix="ematch_"
%%
static unsigned char *strbuf;
static unsigned int strbuf_size; static unsigned int strbuf_size;
static unsigned int strbuf_index; static unsigned int strbuf_index;
@ -52,14 +46,14 @@
strbuf = realloc(strbuf, strbuf_size); strbuf = realloc(strbuf, strbuf_size);
} }
static void strbuf_append_char(unsigned char c) static void strbuf_append_char(char c)
{ {
while (strbuf_index >= strbuf_size) while (strbuf_index >= strbuf_size)
strbuf_enlarge(); strbuf_enlarge();
strbuf[strbuf_index++] = c; strbuf[strbuf_index++] = c;
} }
static void strbuf_append_charp(unsigned char *s) static void strbuf_append_charp(char *s)
{ {
while (strbuf_index >= strbuf_size) while (strbuf_index >= strbuf_size)
strbuf_enlarge(); strbuf_enlarge();
@ -67,6 +61,12 @@
strbuf_index += strlen(s); strbuf_index += strlen(s);
} }
%}
%x str
%option 8bit stack warn noyywrap prefix="ematch_"
%%
[ \t\r\n]+ [ \t\r\n]+
\" { \" {

2
tc/m_ematch.c
View File

@ -193,7 +193,7 @@ static int parse_tree(struct nlmsghdr *n, struct ematch *tree)
addraw_l(n, MAX_MSG, &hdr, sizeof(hdr)); addraw_l(n, MAX_MSG, &hdr, sizeof(hdr));
addraw_l(n, MAX_MSG, &r, sizeof(r)); addraw_l(n, MAX_MSG, &r, sizeof(r));
} else { } else {
int num, err; int num = 0, err;
char buf[64]; char buf[64];
struct ematch_util *e; struct ematch_util *e;