Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by rmind in tick...
details: https://anonhg.NetBSD.org/src/rev/85324957ce5d
branches: netbsd-6
changeset: 775535:85324957ce5d
user: riz <riz%NetBSD.org@localhost>
date: Mon Nov 26 17:39:29 2012 +0000
description:
Pull up following revision(s) (requested by rmind in ticket #718):
usr.sbin/npf/npfctl/npfctl.c: revision 1.22
usr.sbin/npf/npfctl/npfctl.c: revision 1.23
usr.sbin/npf/npfctl/npf_parse.y: revision 1.15
usr.sbin/npf/npfctl/npfctl.c: revision 1.24
usr.sbin/npf/npfctl/npf_parse.y: revision 1.16
usr.sbin/npf/npfctl/npfctl.h: revision 1.22
usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.14
usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.15
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.11
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.12
usr.sbin/npf/npfctl/npf_scan.l: revision 1.7
usr.sbin/npf/npfctl/npf_scan.l: revision 1.8
usr.sbin/npf/npfctl/npf_extmod.c: revision 1.2
usr.sbin/npf/npfctl/npf_extmod.c: revision 1.3
usr.sbin/npf/npfctl/npf_var.c: revision 1.6
usr.sbin/npf/npfctl/npf_var.c: revision 1.7
gcc 4.1 is not smart enough to notice "arg" is only used when initialized
correctly and produces a "might be used unintialized" warning.
npfctl: switch to efun(3) routines.
npfctl: switch to ecalloc(3).
diffstat:
sys/net/npf/npf_impl.h | 4 +-
usr.sbin/npf/npfctl/npf_disassemble.c | 10 ++---
usr.sbin/npf/npfctl/npf_extmod.c | 8 ++--
usr.sbin/npf/npfctl/npf_ncgen.c | 10 ++--
usr.sbin/npf/npfctl/npf_parse.y | 15 ++++----
usr.sbin/npf/npfctl/npf_scan.l | 20 +++++-----
usr.sbin/npf/npfctl/npf_var.c | 12 +++---
usr.sbin/npf/npfctl/npfctl.c | 60 +++-------------------------------
usr.sbin/npf/npfctl/npfctl.h | 8 +--
9 files changed, 47 insertions(+), 100 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r 9b32e481f018 -r 85324957ce5d sys/net/npf/npf_impl.h
--- a/sys/net/npf/npf_impl.h Sun Nov 25 00:19:51 2012 +0000
+++ b/sys/net/npf/npf_impl.h Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.10.2.10 2012/11/24 04:34:42 riz Exp $ */
+/* $NetBSD: npf_impl.h,v 1.10.2.11 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -201,7 +201,7 @@
void npf_tableset_sysinit(void);
void npf_tableset_sysfini(void);
-const pt_tree_ops_t npf_table_ptree_ops;
+extern const pt_tree_ops_t npf_table_ptree_ops;
npf_tableset_t *npf_tableset_create(void);
void npf_tableset_destroy(npf_tableset_t *);
diff -r 9b32e481f018 -r 85324957ce5d usr.sbin/npf/npfctl/npf_disassemble.c
--- a/usr.sbin/npf/npfctl/npf_disassemble.c Sun Nov 25 00:19:51 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_disassemble.c Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_disassemble.c,v 1.3.2.8 2012/11/24 04:34:43 riz Exp $ */
+/* $NetBSD: npf_disassemble.c,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
* FIXME: config generation should be redesigned..
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_disassemble.c,v 1.3.2.8 2012/11/24 04:34:43 riz Exp $");
+__RCSID("$NetBSD: npf_disassemble.c,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -48,8 +48,6 @@
#include <netinet/tcp.h>
#include <net/if.h>
-#include <util.h>
-
#define NPF_OPCODES_STRINGS
#include <net/npf_ncode.h>
@@ -108,7 +106,7 @@
/* Grow array, if needed, and add a new target. */
if (ni->ni_targidx == ni->ni_targsize) {
ni->ni_targsize += 16;
- ni->ni_targs = xrealloc(ni->ni_targs,
+ ni->ni_targs = erealloc(ni->ni_targs,
ni->ni_targsize * sizeof(uint32_t));
}
assert(ni->ni_targidx < ni->ni_targsize);
@@ -372,7 +370,7 @@
nc_inf_t *
npfctl_ncode_disinf(FILE *fp)
{
- nc_inf_t *ni = zalloc(sizeof(nc_inf_t));
+ nc_inf_t *ni = ecalloc(1, sizeof(nc_inf_t));
memset(ni, 0, sizeof(nc_inf_t));
ni->ni_fp = fp;
diff -r 9b32e481f018 -r 85324957ce5d usr.sbin/npf/npfctl/npf_extmod.c
--- a/usr.sbin/npf/npfctl/npf_extmod.c Sun Nov 25 00:19:51 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_extmod.c Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_extmod.c,v 1.3.2.2 2012/11/18 22:38:28 riz Exp $ */
+/* $NetBSD: npf_extmod.c,v 1.3.2.3 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_extmod.c,v 1.3.2.2 2012/11/18 22:38:28 riz Exp $");
+__RCSID("$NetBSD: npf_extmod.c,v 1.3.2.3 2012/11/26 17:39:29 riz Exp $");
#include <stdlib.h>
#include <inttypes.h>
@@ -81,8 +81,8 @@
errx(EXIT_FAILURE, "dlopen: %s", dlerror());
}
- ext = zalloc(sizeof(npf_extmod_t));
- ext->name = xstrdup(name);
+ ext = ecalloc(1, sizeof(npf_extmod_t));
+ ext->name = estrdup(name);
ext->init = npf_extmod_sym(handle, name, "init");
ext->cons = npf_extmod_sym(handle, name, "construct");
ext->param = npf_extmod_sym(handle, name, "param");
diff -r 9b32e481f018 -r 85324957ce5d usr.sbin/npf/npfctl/npf_ncgen.c
--- a/usr.sbin/npf/npfctl/npf_ncgen.c Sun Nov 25 00:19:51 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_ncgen.c Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ncgen.c,v 1.7.2.5 2012/07/25 20:45:23 jdc Exp $ */
+/* $NetBSD: npf_ncgen.c,v 1.7.2.6 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_ncgen.c,v 1.7.2.5 2012/07/25 20:45:23 jdc Exp $");
+__RCSID("$NetBSD: npf_ncgen.c,v 1.7.2.6 2012/11/26 17:39:29 riz Exp $");
#include <stdlib.h>
#include <stddef.h>
@@ -91,7 +91,7 @@
/* Otherwise, re-allocate the buffer and update the pointers. */
ctx->nc_len = NC_ALLOC_ROUND(reqlen);
- ctx->nc_buf = xrealloc(ctx->nc_buf, ctx->nc_len);
+ ctx->nc_buf = erealloc(ctx->nc_buf, ctx->nc_len);
ctx->nc_iptr = (uint8_t *)ctx->nc_buf + offset;
return ctx->nc_iptr;
}
@@ -126,7 +126,7 @@
reqlen = NC_ALLOC_ROUND(ctx->nc_jmp_it * sizeof(ptrdiff_t));
if (reqlen > NC_ALLOC_ROUND(ctx->nc_jmp_len)) {
- ctx->nc_jmp_list = xrealloc(ctx->nc_jmp_list, reqlen);
+ ctx->nc_jmp_list = erealloc(ctx->nc_jmp_list, reqlen);
ctx->nc_jmp_len = reqlen;
}
@@ -145,7 +145,7 @@
nc_ctx_t *
npfctl_ncgen_create(void)
{
- return zalloc(sizeof(nc_ctx_t));
+ return ecalloc(1, sizeof(nc_ctx_t));
}
/*
diff -r 9b32e481f018 -r 85324957ce5d usr.sbin/npf/npfctl/npf_parse.y
--- a/usr.sbin/npf/npfctl/npf_parse.y Sun Nov 25 00:19:51 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_parse.y Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_parse.y,v 1.3.2.8 2012/11/18 22:38:28 riz Exp $ */
+/* $NetBSD: npf_parse.y,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
extern int yyleng;
extern char *yytext;
- char *msg, *context = xstrndup(yytext, yyleng);
+ char *msg, *context = estrndup(yytext, yyleng);
bool eol = (*context == '\n');
va_list ap;
@@ -66,7 +66,7 @@
yylineno - (int)eol, yycolumn, msg);
if (!eol) {
size_t len = strlen(context);
- char *dst = zalloc(len * 4 + 1);
+ char *dst = ecalloc(1, len * 4 + 1);
strvisx(dst, context, len, VIS_WHITE|VIS_CSTYLE);
fprintf(stderr, " near '%s'", dst);
@@ -130,13 +130,13 @@
%token TYPE
%token <num> ICMP
%token <num> ICMP6
-%token <fpnum> FPNUM
%token <num> HEX
%token <str> IDENTIFIER
%token <str> IPV4ADDR
%token <str> IPV6ADDR
%token <num> NUM
+%token <fpnum> FPNUM
%token <str> STRING
%token <str> TABLE_ID
%token <str> VAR_ID
@@ -315,7 +315,7 @@
{
proc_call_t pc;
- pc.pc_name = xstrdup($1);
+ pc.pc_name = estrdup($1);
pc.pc_opts = $3;
$$ = npfvar_create(".proc_call");
npfvar_add_element($$, NPFVAR_PROC, &pc, sizeof(pc));
@@ -338,8 +338,8 @@
{
proc_param_t pp;
- pp.pp_param = xstrdup($1);
- pp.pp_value = $2 ? xstrdup($2) : NULL;
+ pp.pp_param = estrdup($1);
+ pp.pp_value = $2 ? estrdup($2) : NULL;
$$ = npfvar_create(".proc_param");
npfvar_add_element($$, NPFVAR_PROC_PARAM, &pp, sizeof(pp));
}
@@ -610,7 +610,6 @@
| IPV6ADDR { $$ = $1; }
;
-
port_range
: PORT port /* just port */
{
diff -r 9b32e481f018 -r 85324957ce5d usr.sbin/npf/npfctl/npf_scan.l
--- a/usr.sbin/npf/npfctl/npf_scan.l Sun Nov 25 00:19:51 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_scan.l Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_scan.l,v 1.1.2.4 2012/11/18 22:38:28 riz Exp $ */
+/* $NetBSD: npf_scan.l,v 1.1.2.5 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@
"=" return EQ;
"0x"[0-9a-fA-F]+ {
- char *endp, *buf = zalloc(yyleng + 1);
+ char *endp, *buf = ecalloc(1, yyleng + 1);
buf[yyleng] = 0;
yylval.num = strtoul(buf+2, &endp, 16);
free(buf);
@@ -117,46 +117,46 @@
}
{NUMBER}"."{NUMBER} {
- char *endp, *buf = xstrndup(yytext, yyleng);
+ char *endp, *buf = estrndup(yytext, yyleng);
yylval.fpnum = strtod(buf, &endp);
free(buf);
return FPNUM;
}
[0-9a-fA-F]+":"[0-9a-fA-F:]* {
- yylval.str = xstrndup(yytext, yyleng);
+ yylval.str = estrndup(yytext, yyleng);
return IPV6ADDR;
}
{NUMBER}"."[0-9][0-9.]* {
- yylval.str = xstrndup(yytext, yyleng);
+ yylval.str = estrndup(yytext, yyleng);
return IPV4ADDR;
}
{NUMBER} {
- char *endp, *buf = xstrndup(yytext, yyleng);
+ char *endp, *buf = estrndup(yytext, yyleng);
yylval.num = strtoul(buf, &endp, 10);
free(buf);
return NUM;
}
"<"{NID}">" {
- yylval.str = xstrndup(yytext + 1, yyleng - 2);
+ yylval.str = estrndup(yytext + 1, yyleng - 2);
return TABLE_ID;
}
"$"{NID} {
- yylval.str = xstrndup(yytext + 1, yyleng - 1);
+ yylval.str = estrndup(yytext + 1, yyleng - 1);
return VAR_ID;
}
{ID} {
- yylval.str = xstrndup(yytext, yyleng);
+ yylval.str = estrndup(yytext, yyleng);
return IDENTIFIER;
}
\"[^\"]*\" {
- yylval.str = xstrndup(yytext + 1, yyleng - 2);
+ yylval.str = estrndup(yytext + 1, yyleng - 2);
return STRING;
}
diff -r 9b32e481f018 -r 85324957ce5d usr.sbin/npf/npfctl/npf_var.c
--- a/usr.sbin/npf/npfctl/npf_var.c Sun Nov 25 00:19:51 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_var.c Mon Nov 26 17:39:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_var.c,v 1.3.2.1 2012/06/26 00:07:20 riz Exp $ */
+/* $NetBSD: npf_var.c,v 1.3.2.2 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_var.c,v 1.3.2.1 2012/06/26 00:07:20 riz Exp $");
+__RCSID("$NetBSD: npf_var.c,v 1.3.2.2 2012/11/26 17:39:29 riz Exp $");
#include <stdlib.h>
#include <string.h>
@@ -60,8 +60,8 @@
npfvar_t *
Home |
Main Index |
Thread Index |
Old Index