svn commit: r188303 - head/sys/geom/part

[Warner Losh]

Author: imp
Date: Sun Feb  8 07:05:23 2009
New Revision: 188303
URL: http://svn.freebsd.org/changeset/base/188303

Log:
  Fix g_part_*dumpconf to return void to match kobj definition.
  Fix g_part_*name to return a const char * rather than a char *.

Modified:
  head/sys/geom/part/g_part_bsd.c
  head/sys/geom/part/g_part_mbr.c

Modified: head/sys/geom/part/g_part_bsd.c
==============================================================================
--- head/sys/geom/part/g_part_bsd.c	Sun Feb  8 07:03:34 2009	(r188302)
+++ head/sys/geom/part/g_part_bsd.c	Sun Feb  8 07:05:23 2009	(r188303)
@@ -60,12 +60,12 @@ static int g_part_bsd_add(struct g_part_
     struct g_part_parms *);
 static int g_part_bsd_create(struct g_part_table *, struct g_part_parms *);
 static int g_part_bsd_destroy(struct g_part_table *, struct g_part_parms *);
-static int g_part_bsd_dumpconf(struct g_part_table *, struct g_part_entry *,
+static void g_part_bsd_dumpconf(struct g_part_table *, struct g_part_entry *,
     struct sbuf *, const char *);
 static int g_part_bsd_dumpto(struct g_part_table *, struct g_part_entry *);
 static int g_part_bsd_modify(struct g_part_table *, struct g_part_entry *,  
     struct g_part_parms *);
-static char *g_part_bsd_name(struct g_part_table *, struct g_part_entry *,
+static const char *g_part_bsd_name(struct g_part_table *, struct g_part_entry *,
     char *, size_t);
 static int g_part_bsd_probe(struct g_part_table *, struct g_consumer *);
 static int g_part_bsd_read(struct g_part_table *, struct g_consumer *);
@@ -216,7 +216,7 @@ g_part_bsd_destroy(struct g_part_table *
 	return (0);
 }
 
-static int
+static void
 g_part_bsd_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry, 
     struct sbuf *sb, const char *indent)
 {
@@ -233,7 +233,6 @@ g_part_bsd_dumpconf(struct g_part_table 
 	} else {
 		/* confxml: scheme information */
 	}
-	return (0);
 }
 
 static int
@@ -262,7 +261,7 @@ g_part_bsd_modify(struct g_part_table *b
 	return (0);
 }
 
-static char *
+static const char *
 g_part_bsd_name(struct g_part_table *table, struct g_part_entry *baseentry,
     char *buf, size_t bufsz)
 {

Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c	Sun Feb  8 07:03:34 2009	(r188302)
+++ head/sys/geom/part/g_part_mbr.c	Sun Feb  8 07:05:23 2009	(r188303)
@@ -62,12 +62,12 @@ static int g_part_mbr_add(struct g_part_
 static int g_part_mbr_bootcode(struct g_part_table *, struct g_part_parms *);
 static int g_part_mbr_create(struct g_part_table *, struct g_part_parms *);
 static int g_part_mbr_destroy(struct g_part_table *, struct g_part_parms *);
-static int g_part_mbr_dumpconf(struct g_part_table *, struct g_part_entry *,
+static void g_part_mbr_dumpconf(struct g_part_table *, struct g_part_entry *,
     struct sbuf *, const char *);
 static int g_part_mbr_dumpto(struct g_part_table *, struct g_part_entry *);
 static int g_part_mbr_modify(struct g_part_table *, struct g_part_entry *,  
     struct g_part_parms *);
-static char *g_part_mbr_name(struct g_part_table *, struct g_part_entry *,
+static const char *g_part_mbr_name(struct g_part_table *, struct g_part_entry *,
     char *, size_t);
 static int g_part_mbr_probe(struct g_part_table *, struct g_consumer *);
 static int g_part_mbr_read(struct g_part_table *, struct g_consumer *);
@@ -256,7 +256,7 @@ g_part_mbr_destroy(struct g_part_table *
 	return (0);
 }
 
-static int
+static void
 g_part_mbr_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry, 
     struct sbuf *sb, const char *indent)
 {
@@ -275,7 +275,6 @@ g_part_mbr_dumpconf(struct g_part_table 
 	} else {
 		/* confxml: scheme information */
 	}
-	return (0);
 }
 
 static int
@@ -303,7 +302,7 @@ g_part_mbr_modify(struct g_part_table *b
 	return (0);
 }
 
-static char *
+static const char *
 g_part_mbr_name(struct g_part_table *table, struct g_part_entry *baseentry,
     char *buf, size_t bufsz)
 {