diff options
| author | imp <imp@FreeBSD.org> | 2009-02-08 07:05:23 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2009-02-08 07:05:23 +0000 |
| commit | de0440230a608745b647cff0dc9189aa3628ada1 (patch) | |
| tree | 21b6714e0422b0d6f8ef8da153608f3315b0cff7 | |
| parent | f765a01b0903c0c06f893303e551e6d959db5a5a (diff) | |
| download | FreeBSD-src-de0440230a608745b647cff0dc9189aa3628ada1.zip FreeBSD-src-de0440230a608745b647cff0dc9189aa3628ada1.tar.gz | |
Fix g_part_*dumpconf to return void to match kobj definition.
Fix g_part_*name to return a const char * rather than a char *.
| -rw-r--r-- | sys/geom/part/g_part_bsd.c | 9 | ||||
| -rw-r--r-- | sys/geom/part/g_part_mbr.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sys/geom/part/g_part_bsd.c b/sys/geom/part/g_part_bsd.c index 0c12c01..b24c111 100644 --- a/sys/geom/part/g_part_bsd.c +++ b/sys/geom/part/g_part_bsd.c @@ -60,12 +60,12 @@ static int g_part_bsd_add(struct g_part_table *, struct g_part_entry *, 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 *basetable, struct g_part_parms *gpp) 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 *table, struct g_part_entry *baseentry, } else { /* confxml: scheme information */ } - return (0); } static int @@ -262,7 +261,7 @@ g_part_bsd_modify(struct g_part_table *basetable, 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) { diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c index b0ba323..19341ff 100644 --- a/sys/geom/part/g_part_mbr.c +++ b/sys/geom/part/g_part_mbr.c @@ -62,12 +62,12 @@ static int g_part_mbr_add(struct g_part_table *, struct g_part_entry *, 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 *basetable, struct g_part_parms *gpp) 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 *table, struct g_part_entry *baseentry, } else { /* confxml: scheme information */ } - return (0); } static int @@ -303,7 +302,7 @@ g_part_mbr_modify(struct g_part_table *basetable, 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) { |
