From owner-svn-src-projects@FreeBSD.ORG Mon Jun 4 17:13:33 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C7D41065672; Mon, 4 Jun 2012 17:13:33 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E1C48FC14; Mon, 4 Jun 2012 17:13:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q54HDXpw054540; Mon, 4 Jun 2012 17:13:33 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q54HDXvn054532; Mon, 4 Jun 2012 17:13:33 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206041713.q54HDXvn054532@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 4 Jun 2012 17:13:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236570 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2012 17:13:33 -0000 Author: glebius Date: Mon Jun 4 17:13:32 2012 New Revision: 236570 URL: http://svn.freebsd.org/changeset/base/236570 Log: Rename malloc(9) shortdescs so that they don't contain spaces. Suggested by: bde Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pf_if.c projects/pf/head/sys/contrib/pf/net/pf_ioctl.c projects/pf/head/sys/contrib/pf/net/pf_osfp.c projects/pf/head/sys/contrib/pf/net/pf_table.c Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/if_pfsync.c Mon Jun 4 17:10:02 2012 (r236569) +++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c Mon Jun 4 17:13:32 2012 (r236570) @@ -238,7 +238,7 @@ struct pfsync_softc { #define PFSYNC_BUNLOCK(sc) mtx_unlock(&(sc)->sc_bulk_mtx) #define PFSYNC_BLOCK_ASSERT(sc) mtx_assert(&(sc)->sc_bulk_mtx, MA_OWNED) -static MALLOC_DEFINE(M_PFSYNC, "pfsync(4)", "pfsync(4) data"); +static MALLOC_DEFINE(M_PFSYNC, "pfsync", "pfsync(4) data"); static VNET_DEFINE(struct pfsync_softc *, pfsyncif) = NULL; #define V_pfsyncif VNET(pfsyncif) static VNET_DEFINE(void *, pfsync_swi_cookie) = NULL; Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Mon Jun 4 17:10:02 2012 (r236569) +++ projects/pf/head/sys/contrib/pf/net/pf.c Mon Jun 4 17:13:32 2012 (r236570) @@ -155,7 +155,7 @@ VNET_DEFINE(struct pf_anchor_stackframe, /* * Queue for pf_intr() sends. */ -static MALLOC_DEFINE(M_PFTEMP, "pf(4) temp", "pf(4) temporary allocations"); +static MALLOC_DEFINE(M_PFTEMP, "pf_temp", "pf(4) temporary allocations"); struct pf_send_entry { STAILQ_ENTRY(pf_send_entry) pfse_next; struct mbuf *pfse_m; @@ -348,7 +348,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[P s->rule.ptr->states_cur--; \ } while (0) -static MALLOC_DEFINE(M_PFHASH, "pf(4) hash", "pf(4) hash header structures"); +static MALLOC_DEFINE(M_PFHASH, "pf_hash", "pf(4) hash header structures"); /* XXXGL: make static? */ VNET_DEFINE(struct pf_keyhash *, pf_keyhash); VNET_DEFINE(struct pf_idhash *, pf_idhash); Modified: projects/pf/head/sys/contrib/pf/net/pf_if.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_if.c Mon Jun 4 17:10:02 2012 (r236569) +++ projects/pf/head/sys/contrib/pf/net/pf_if.c Mon Jun 4 17:13:32 2012 (r236570) @@ -110,7 +110,7 @@ static VNET_DEFINE(struct pfi_ifhead, pf #define V_pfi_ifs VNET(pfi_ifs) #define PFI_BUFFER_MAX 0x10000 -MALLOC_DEFINE(PFI_MTYPE, "pf(4) ifnets", "pf(4) interface database"); +MALLOC_DEFINE(PFI_MTYPE, "pf_ifnet", "pf(4) interface database"); LIST_HEAD(pfi_list, pfi_kif); static VNET_DEFINE(struct pfi_list, pfi_unlinked_kifs); Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Mon Jun 4 17:10:02 2012 (r236569) +++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Mon Jun 4 17:13:32 2012 (r236570) @@ -157,9 +157,9 @@ TAILQ_HEAD(pf_tags, pf_tagname); VNET_DEFINE(struct pf_tags, pf_tags); #define V_pf_qids VNET(pf_qids) VNET_DEFINE(struct pf_tags, pf_qids); -static MALLOC_DEFINE(M_PFTAG, "pf(4) tag", "pf(4) tag names"); -static MALLOC_DEFINE(M_PFALTQ, "pf(4) altq", "pf(4) altq configuration db"); -static MALLOC_DEFINE(M_PFRULE, "pf(4) rules", "pf(4) rules"); +static MALLOC_DEFINE(M_PFTAG, "pf_tag", "pf(4) tag names"); +static MALLOC_DEFINE(M_PFALTQ, "pf_altq", "pf(4) altq configuration db"); +static MALLOC_DEFINE(M_PFRULE, "pf_rule", "pf(4) rules"); #if (PF_QNAME_SIZE != PF_TAG_NAME_SIZE) #error PF_QNAME_SIZE must be equal to PF_TAG_NAME_SIZE Modified: projects/pf/head/sys/contrib/pf/net/pf_osfp.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_osfp.c Mon Jun 4 17:10:02 2012 (r236569) +++ projects/pf/head/sys/contrib/pf/net/pf_osfp.c Mon Jun 4 17:13:32 2012 (r236570) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include -static MALLOC_DEFINE(M_PFOSFP, "pf(4) osfp", "pf(4) operating system fingerprints"); +static MALLOC_DEFINE(M_PFOSFP, "pf_osfp", "pf(4) operating system fingerprints"); #define DPFPRINTF(format, x...) \ if (V_pf_status.debug >= PF_DEBUG_NOISY) \ printf(format , ##x) Modified: projects/pf/head/sys/contrib/pf/net/pf_table.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_table.c Mon Jun 4 17:10:02 2012 (r236569) +++ projects/pf/head/sys/contrib/pf/net/pf_table.c Mon Jun 4 17:13:32 2012 (r236570) @@ -118,7 +118,7 @@ struct pfr_walktree { #define senderr(e) do { rv = (e); goto _bad; } while (0) -static MALLOC_DEFINE(M_PFTABLE, "pf(4) table", "pf(4) tables structures"); +static MALLOC_DEFINE(M_PFTABLE, "pf_table", "pf(4) tables structures"); static VNET_DEFINE(uma_zone_t, pfr_kentry_z); #define V_pfr_kentry_z VNET(pfr_kentry_z) static VNET_DEFINE(uma_zone_t, pfr_kcounters_z);