From owner-svn-src-projects@FreeBSD.ORG Fri Jan 9 20:57:44 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FEC01065673; Fri, 9 Jan 2009 20:57:44 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B5278FC0A; Fri, 9 Jan 2009 20:57:44 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n09Kvidx068619; Fri, 9 Jan 2009 20:57:44 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n09Kvhpi068605; Fri, 9 Jan 2009 20:57:43 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901092057.n09Kvhpi068605@svn.freebsd.org> From: Sam Leffler Date: Fri, 9 Jan 2009 20:57:43 +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: r186975 - in projects/vap7/sys: . contrib/pf dev dev/acpi_support dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar5416 dev/... 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: Fri, 09 Jan 2009 20:57:45 -0000 Author: sam Date: Fri Jan 9 20:57:43 2009 New Revision: 186975 URL: http://svn.freebsd.org/changeset/base/186975 Log: merge r181463 which revs the sbuf api; need this so user code builds unchanged Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/acpi_support/acpi_asus.c projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/led/led.c projects/vap7/sys/geom/concat/g_concat.c projects/vap7/sys/geom/geom_ccd.c projects/vap7/sys/geom/geom_ctl.c projects/vap7/sys/geom/geom_disk.c projects/vap7/sys/geom/geom_kern.c projects/vap7/sys/geom/geom_slice.c projects/vap7/sys/geom/geom_subr.c projects/vap7/sys/geom/part/g_part.c projects/vap7/sys/geom/stripe/g_stripe.c projects/vap7/sys/kern/vfs_mount.c projects/vap7/sys/security/mac_portacl/mac_portacl.c projects/vap7/sys/sys/sbuf.h Modified: projects/vap7/sys/dev/acpi_support/acpi_asus.c ============================================================================== --- projects/vap7/sys/dev/acpi_support/acpi_asus.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/dev/acpi_support/acpi_asus.c Fri Jan 9 20:57:43 2009 (r186975) @@ -552,7 +552,7 @@ acpi_asus_probe(device_t dev) } } - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); if (sb == NULL) return (ENOMEM); Modified: projects/vap7/sys/dev/led/led.c ============================================================================== --- projects/vap7/sys/dev/led/led.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/dev/led/led.c Fri Jan 9 20:57:43 2009 (r186975) @@ -141,7 +141,7 @@ led_write(struct cdev *dev, struct uio * return(error); } - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); if (sb == NULL) { free(s2, M_DEVBUF); return (ENOMEM); Modified: projects/vap7/sys/geom/concat/g_concat.c ============================================================================== --- projects/vap7/sys/geom/concat/g_concat.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/concat/g_concat.c Fri Jan 9 20:57:43 2009 (r186975) @@ -748,7 +748,7 @@ g_concat_ctl_create(struct gctl_req *req } sc = gp->softc; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "Can't attach disk(s) to %s:", gp->name); for (attached = 0, no = 1; no < *nargs; no++) { snprintf(param, sizeof(param), "arg%u", no); Modified: projects/vap7/sys/geom/geom_ccd.c ============================================================================== --- projects/vap7/sys/geom/geom_ccd.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/geom_ccd.c Fri Jan 9 20:57:43 2009 (r186975) @@ -790,7 +790,7 @@ g_ccd_create(struct gctl_req *req, struc pp->sectorsize = sc->sc_secsize; g_error_provider(pp, 0); - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "ccd%d: %d components ", sc->sc_unit, *nprovider); for (i = 0; i < *nprovider; i++) { sbuf_printf(sb, "%s%s", @@ -840,7 +840,7 @@ g_ccd_list(struct gctl_req *req, struct up = gctl_get_paraml(req, "unit", sizeof (int)); unit = *up; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); LIST_FOREACH(gp, &mp->geom, geom) { cs = gp->softc; if (cs == NULL || (unit >= 0 && unit != cs->sc_unit)) Modified: projects/vap7/sys/geom/geom_ctl.c ============================================================================== --- projects/vap7/sys/geom/geom_ctl.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/geom_ctl.c Fri Jan 9 20:57:43 2009 (r186975) @@ -464,7 +464,7 @@ g_ctl_ioctl_ctl(struct cdev *dev, u_long req = (void *)data; req->nerror = 0; - req->serror = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + req->serror = sbuf_new_auto(); /* It is an error if we cannot return an error text */ if (req->lerror < 2) return (EINVAL); Modified: projects/vap7/sys/geom/geom_disk.c ============================================================================== --- projects/vap7/sys/geom/geom_disk.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/geom_disk.c Fri Jan 9 20:57:43 2009 (r186975) @@ -516,7 +516,7 @@ sysctl_disks(SYSCTL_HANDLER_ARGS) int error; struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); g_waitfor_event(g_kern_disks, sb, M_WAITOK, NULL); error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); sbuf_delete(sb); Modified: projects/vap7/sys/geom/geom_kern.c ============================================================================== --- projects/vap7/sys/geom/geom_kern.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/geom_kern.c Fri Jan 9 20:57:43 2009 (r186975) @@ -180,7 +180,7 @@ sysctl_kern_geom_conftxt(SYSCTL_HANDLER_ int error; struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); g_waitfor_event(g_conftxt, sb, M_WAITOK, NULL); error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); sbuf_delete(sb); @@ -193,7 +193,7 @@ sysctl_kern_geom_confdot(SYSCTL_HANDLER_ int error; struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); g_waitfor_event(g_confdot, sb, M_WAITOK, NULL); error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); sbuf_delete(sb); @@ -206,7 +206,7 @@ sysctl_kern_geom_confxml(SYSCTL_HANDLER_ int error; struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); g_waitfor_event(g_confxml, sb, M_WAITOK, NULL); error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); sbuf_delete(sb); Modified: projects/vap7/sys/geom/geom_slice.c ============================================================================== --- projects/vap7/sys/geom/geom_slice.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/geom_slice.c Fri Jan 9 20:57:43 2009 (r186975) @@ -385,7 +385,7 @@ g_slice_config(struct g_geom *gp, u_int pp->mediasize = gsl->length; return (0); } - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); va_start(ap, fmt); sbuf_vprintf(sb, fmt, ap); va_end(ap); Modified: projects/vap7/sys/geom/geom_subr.c ============================================================================== --- projects/vap7/sys/geom/geom_subr.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/geom_subr.c Fri Jan 9 20:57:43 2009 (r186975) @@ -324,7 +324,7 @@ g_new_geomf(struct g_class *mp, const ch g_topology_assert(); G_VALID_CLASS(mp); - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); va_start(ap, fmt); sbuf_vprintf(sb, fmt, ap); va_end(ap); @@ -564,7 +564,7 @@ g_new_providerf(struct g_geom *gp, const KASSERT(!(gp->flags & G_GEOM_WITHER), ("new provider on WITHERing geom(%s) (class %s)", gp->name, gp->class->name)); - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); va_start(ap, fmt); sbuf_vprintf(sb, fmt, ap); va_end(ap); Modified: projects/vap7/sys/geom/part/g_part.c ============================================================================== --- projects/vap7/sys/geom/part/g_part.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/part/g_part.c Fri Jan 9 20:57:43 2009 (r186975) @@ -506,7 +506,7 @@ g_part_ctl_add(struct gctl_req *req, str /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s%s added\n", gp->name, G_PART_NAME(table, entry, buf, sizeof(buf))); sbuf_finish(sb); @@ -545,7 +545,7 @@ g_part_ctl_bootcode(struct gctl_req *req /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s has bootcode\n", gp->name); sbuf_finish(sb); gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); @@ -749,7 +749,7 @@ g_part_ctl_create(struct gctl_req *req, /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s created\n", gp->name); sbuf_finish(sb); gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); @@ -821,7 +821,7 @@ g_part_ctl_delete(struct gctl_req *req, /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s%s deleted\n", gp->name, G_PART_NAME(table, entry, buf, sizeof(buf))); sbuf_finish(sb); @@ -877,7 +877,7 @@ g_part_ctl_destroy(struct gctl_req *req, /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s destroyed\n", gp->name); sbuf_finish(sb); gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); @@ -924,7 +924,7 @@ g_part_ctl_modify(struct gctl_req *req, /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s%s modified\n", gp->name, G_PART_NAME(table, entry, buf, sizeof(buf))); sbuf_finish(sb); @@ -991,7 +991,7 @@ g_part_ctl_setunset(struct gctl_req *req /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "%s%s has %s %sset\n", gp->name, G_PART_NAME(table, entry, buf, sizeof(buf)), gpp->gpp_attrib, (set) ? "" : "un"); Modified: projects/vap7/sys/geom/stripe/g_stripe.c ============================================================================== --- projects/vap7/sys/geom/stripe/g_stripe.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/geom/stripe/g_stripe.c Fri Jan 9 20:57:43 2009 (r186975) @@ -1069,7 +1069,7 @@ g_stripe_ctl_create(struct gctl_req *req } sc = gp->softc; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); sbuf_printf(sb, "Can't attach disk(s) to %s:", gp->name); for (attached = 0, no = 1; no < *nargs; no++) { snprintf(param, sizeof(param), "arg%u", no); Modified: projects/vap7/sys/kern/vfs_mount.c ============================================================================== --- projects/vap7/sys/kern/vfs_mount.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/kern/vfs_mount.c Fri Jan 9 20:57:43 2009 (r186975) @@ -2177,7 +2177,7 @@ mount_argf(struct mntarg *ma, const char ma->v[ma->len].iov_len = strlen(name) + 1; ma->len++; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); va_start(ap, fmt); sbuf_vprintf(sb, fmt, ap); va_end(ap); Modified: projects/vap7/sys/security/mac_portacl/mac_portacl.c ============================================================================== --- projects/vap7/sys/security/mac_portacl/mac_portacl.c Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/security/mac_portacl/mac_portacl.c Fri Jan 9 20:57:43 2009 (r186975) @@ -306,7 +306,7 @@ rules_to_string(void) int needcomma; char *temp; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sb = sbuf_new_auto(); needcomma = 0; mtx_lock(&rule_mtx); for (rule = TAILQ_FIRST(&rule_head); rule != NULL; Modified: projects/vap7/sys/sys/sbuf.h ============================================================================== --- projects/vap7/sys/sys/sbuf.h Fri Jan 9 20:57:01 2009 (r186974) +++ projects/vap7/sys/sys/sbuf.h Fri Jan 9 20:57:43 2009 (r186975) @@ -56,6 +56,8 @@ __BEGIN_DECLS * API functions */ struct sbuf *sbuf_new(struct sbuf *, char *, int, int); +#define sbuf_new_auto() \ + sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND) void sbuf_clear(struct sbuf *); int sbuf_setpos(struct sbuf *, int); int sbuf_bcat(struct sbuf *, const void *, size_t);