Fix g_part_*dumpconf to return void to match kobj definition.
Fix g_part_*name to return a const char * rather than a char *.
This commit is contained in:
parent
f765a01b09
commit
de0440230a
@ -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)
|
||||
{
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user