d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some compile errors at high WARNS, including one

Browse Source 
for an uninitialized variable.

unused parameters and variables are annotated with
	(void)foo;	/* UNUSED */
instead of __unused, because this code needs to build
also on linux and windows.
This commit is contained in:
Luigi Rizzo 2012-07-30 10:55:23 +00:00
parent 72a1e3395c
commit 6a7bb02d77
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/ipfw/dummynet.c
View File

@ -759,7 +759,8 @@ load_extra_delays(const char *filename, struct dn_profile *p,
void
ipfw_config_pipe(int ac, char **av)
{
int i, j;
int i;
u_int j;
char *end;
struct dn_id *buf, *base;
struct dn_sch *sch = NULL;
@ -1282,8 +1283,8 @@ parse_range(int ac, char *av[], uint32_t *v, int len)
av--;
}
if (v[1] < v[0] ||
v[1] < 0 || v[1] >= DN_MAX_ID-1 ||
v[0] < 0 || v[1] >= DN_MAX_ID-1) {
v[1] >= DN_MAX_ID-1 ||
v[1] >= DN_MAX_ID-1) {
continue; /* invalid entry */
}
n++;
@ -1310,11 +1311,12 @@ void
dummynet_list(int ac, char *av[], int show_counters)
{
struct dn_id *oid, *x = NULL;
int ret, i, l;
int ret, i;
int n; /* # of ranges */
int buflen;
int max_size; /* largest obj passed up */
u_int buflen, l;
u_int max_size; /* largest obj passed up */
(void)show_counters; // XXX unused, but we should use it.
ac--;
av++; /* skip 'list' | 'show' word */

5
sbin/ipfw/ipfw2.c
View File

@ -412,7 +412,7 @@ do_cmd(int optname, void *optval, uintptr_t optlen)
* and calls setsockopt().
* Function returns 0 on success or -1 otherwise.
*/
int
static int
do_setcmd3(int optname, void *optval, socklen_t optlen)
{
socklen_t len;
@ -3930,6 +3930,7 @@ ipfw_table_handler(int ac, char *av[])
uint32_t a, type, mask, addrlen;
uint32_t tables_max;
mask = 0; // XXX uninitialized ?
len = sizeof(tables_max);
if (sysctlbyname("net.inet.ip.fw.tables_max", &tables_max, &len,
NULL, 0) == -1)
@ -4135,7 +4136,7 @@ table_list(uint16_t num, int need_header)
if (sz < xent->len)
break;
sz -= xent->len;
xent = (void *)xent + xent->len;
xent = (ipfw_table_xentry *)((char *)xent + xent->len);
}
free(tbl);

2
sbin/ipfw/nat.c
View File

@ -318,6 +318,7 @@ estimate_redir_addr(int *ac, char ***av)
char *sep = **av;
u_int c = 0;
(void)ac; /* UNUSED */
while ((sep = strchr(sep, ',')) != NULL) {
c++;
sep++;
@ -379,6 +380,7 @@ estimate_redir_port(int *ac, char ***av)
char *sep = **av;
u_int c = 0;
(void)ac; /* UNUSED */
while ((sep = strchr(sep, ',')) != NULL) {
c++;
sep++;