Module Name: src
Committed By: christos
Date: Thu Jan 5 20:21:35 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c label.c savenewlabel.c
Log Message:
use getfstypename from libutil.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.118 -r1.119 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/savenewlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.156 src/distrib/utils/sysinst/defs.h:1.157
--- src/distrib/utils/sysinst/defs.h:1.156 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.156 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: defs.h,v 1.157 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -40,7 +40,6 @@
/* System includes needed for this. */
#include <sys/types.h>
#include <sys/disklabel.h>
-const char *getfstypename(char *, size_t, uint8_t);
static inline void *
deconst(const void *p)
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.118 src/distrib/utils/sysinst/disks.c:1.119
--- src/distrib/utils/sysinst/disks.c:1.118 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.118 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: disks.c,v 1.119 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,7 +46,6 @@
#include <sys/swap.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-#define FSTYPENAMES
#include <sys/disklabel.h>
#include <dev/scsipi/scsipi_all.h>
@@ -88,18 +87,6 @@ static void fixsb(const char *, const ch
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
-const char *
-getfstypename(char *buf, size_t len, uint8_t fstype)
-{
-
- if (fstype >= __arraycount(fstypenames) ||
- fstypenames[fstype] == NULL)
- snprintf(buf, len, "*unknown*%" PRIu8 "*", fstype);
- else
- strlcpy(buf, fstypenames[fstype], len);
- return buf;
-}
-
/* from src/sbin/atactl/atactl.c
* extract_string: copy a block of bytes out of ataparams and make
* a proper string out of it, truncating trailing spaces and preserving
@@ -447,7 +434,6 @@ fmt_fspart(menudesc *m, int ptn, void *a
{
unsigned int poffset, psize, pend;
const char *desc;
- char buf[128];
static const char *Yes, *No;
partinfo *p = bsdlabel + ptn;
@@ -469,7 +455,7 @@ fmt_fspart(menudesc *m, int ptn, void *a
else
desc = "FFSv1";
else
- desc = getfstypename(buf, sizeof(buf), p->pi_fstype);
+ desc = getfstypename(p->pi_fstype);
#ifdef PART_BOOT
if (ptn == PART_BOOT)
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.58 src/distrib/utils/sysinst/label.c:1.59
--- src/distrib/utils/sysinst/label.c:1.58 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/label.c Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.58 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: label.c,v 1.59 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.58 2012/01/05 19:43:59 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.59 2012/01/05 20:21:35 christos Exp $");
#endif
#include <sys/types.h>
@@ -388,8 +388,7 @@ edit_ptn(menudesc *menu, void *arg)
if (all_fstype_menu == -1) {
for (i = 0; i < nelem(all_fstypes); i++) {
char buf[128];
- all_fstypes[i].opt_name = strdup(getfstypename(buf,
- sizeof(buf), i));
+ all_fstypes[i].opt_name = getfstypename(i);
all_fstypes[i].opt_menu = OPT_NOMENU;
all_fstypes[i].opt_flags = 0;
all_fstypes[i].opt_action = set_fstype;
@@ -474,7 +473,6 @@ set_ptn_label(menudesc *m, int opt, void
{
partinfo *p = arg;
const char *c;
- char buf[128];
if (m->opts[opt].opt_flags & OPT_IGNORE
&& (opt != PTN_MENU_END || p->pi_fstype == FS_UNUSED)) {
@@ -490,7 +488,7 @@ set_ptn_label(menudesc *m, int opt, void
else
c = "FFSv1";
else
- c = getfstypename(buf, sizeof(buf), p->pi_fstype);
+ c = getfstypename(p->pi_fstype);
wprintw(m->mw, msg_string(MSG_fstype_fmt), c);
break;
case PTN_MENU_START:
Index: src/distrib/utils/sysinst/savenewlabel.c
diff -u src/distrib/utils/sysinst/savenewlabel.c:1.8 src/distrib/utils/sysinst/savenewlabel.c:1.9
--- src/distrib/utils/sysinst/savenewlabel.c:1.8 Thu Jan 5 14:43:59 2012
+++ src/distrib/utils/sysinst/savenewlabel.c Thu Jan 5 15:21:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.8 2012/01/05 19:43:59 christos Exp $ */
+/* $NetBSD: savenewlabel.c,v 1.9 2012/01/05 20:21:35 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: savenewlabel.c,v 1.8 2012/01/05 19:43:59 christos Exp $");
+__RCSID("$NetBSD: savenewlabel.c,v 1.9 2012/01/05 20:21:35 christos Exp $");
#endif
#include <sys/types.h>
@@ -86,13 +86,10 @@ savenewlabel(partinfo *lp, int nparts)
(uint32_t)dlsize);
scripting_fprintf(f, "\t:se#%d:%s\\\n", sectorsize, doessf);
for (i = 0; i < nparts; i++) {
- char fstypename[128];
-
scripting_fprintf(f, "\t:p%c#%" PRIu32 ":o%c#%" PRIu32
":t%c=%s:", 'a'+i, (uint32_t)bsdlabel[i].pi_size,
'a'+i, (uint32_t)bsdlabel[i].pi_offset, 'a'+i,
- getfstypename(fstypename, sizeof(fstypename),
- bsdlabel[i].pi_fstype));
+ getfstypename(bsdlabel[i].pi_fstype));
if (PI_ISBSDFS(&bsdlabel[i]))
scripting_fprintf (f, "b%c#%" PRIu32 ":f%c#%" PRIu32
":ta=4.2BSD:", 'a'+i,
