svn commit: r187065 - in stable/7/sys: . dev/acpi_support dev/cxgb
dev/led geom geom/concat geom/part geom/stripe kern
security/mac_portacl sys
Sam Leffler
sam at FreeBSD.org
Sun Jan 11 13:45:25 PST 2009
Author: sam
Date: Sun Jan 11 21:45:23 2009
New Revision: 187065
URL: http://svn.freebsd.org/changeset/base/187065
Log:
MFC r181463: add sbuf_new_auto
Modified:
stable/7/sys/ (props changed)
stable/7/sys/dev/acpi_support/acpi_asus.c
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/dev/led/led.c
stable/7/sys/geom/concat/g_concat.c
stable/7/sys/geom/geom_ccd.c
stable/7/sys/geom/geom_ctl.c
stable/7/sys/geom/geom_disk.c
stable/7/sys/geom/geom_kern.c
stable/7/sys/geom/geom_slice.c
stable/7/sys/geom/geom_subr.c
stable/7/sys/geom/part/g_part.c
stable/7/sys/geom/stripe/g_stripe.c
stable/7/sys/kern/vfs_mount.c
stable/7/sys/security/mac_portacl/mac_portacl.c
stable/7/sys/sys/sbuf.h
Modified: stable/7/sys/dev/acpi_support/acpi_asus.c
==============================================================================
--- stable/7/sys/dev/acpi_support/acpi_asus.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/dev/acpi_support/acpi_asus.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/dev/led/led.c
==============================================================================
--- stable/7/sys/dev/led/led.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/dev/led/led.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/concat/g_concat.c
==============================================================================
--- stable/7/sys/geom/concat/g_concat.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/concat/g_concat.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/geom_ccd.c
==============================================================================
--- stable/7/sys/geom/geom_ccd.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/geom_ccd.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/geom_ctl.c
==============================================================================
--- stable/7/sys/geom/geom_ctl.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/geom_ctl.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/geom_disk.c
==============================================================================
--- stable/7/sys/geom/geom_disk.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/geom_disk.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/geom_kern.c
==============================================================================
--- stable/7/sys/geom/geom_kern.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/geom_kern.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/geom_slice.c
==============================================================================
--- stable/7/sys/geom/geom_slice.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/geom_slice.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/geom_subr.c
==============================================================================
--- stable/7/sys/geom/geom_subr.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/geom_subr.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/part/g_part.c
==============================================================================
--- stable/7/sys/geom/part/g_part.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/part/g_part.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/geom/stripe/g_stripe.c
==============================================================================
--- stable/7/sys/geom/stripe/g_stripe.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/geom/stripe/g_stripe.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/kern/vfs_mount.c
==============================================================================
--- stable/7/sys/kern/vfs_mount.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/kern/vfs_mount.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/security/mac_portacl/mac_portacl.c
==============================================================================
--- stable/7/sys/security/mac_portacl/mac_portacl.c Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/security/mac_portacl/mac_portacl.c Sun Jan 11 21:45:23 2009 (r187065)
@@ -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: stable/7/sys/sys/sbuf.h
==============================================================================
--- stable/7/sys/sys/sbuf.h Sun Jan 11 21:27:28 2009 (r187064)
+++ stable/7/sys/sys/sbuf.h Sun Jan 11 21:45:23 2009 (r187065)
@@ -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);
More information about the svn-src-all
mailing list