[src/trunk]: src/sbin/gpt Remove FreeBSD specific code as per message to tech...

[jnemeth <jnemeth%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/745cc4f55d29
branches:  trunk
changeset: 791635:745cc4f55d29
user:      jnemeth <jnemeth%NetBSD.org@localhost>
date:      Wed Nov 27 01:47:53 2013 +0000

description:
Remove FreeBSD specific code as per message to tech-userlevel.

diffstat:

 sbin/gpt/add.c      |   7 +-----
 sbin/gpt/biosboot.c |   6 +---
 sbin/gpt/gpt.c      |  56 +----------------------------------------------------
 sbin/gpt/gpt.h      |  15 --------------
 sbin/gpt/label.c    |   7 +-----
 sbin/gpt/remove.c   |   7 +-----
 sbin/gpt/resize.c   |   7 +-----
 7 files changed, 7 insertions(+), 98 deletions(-)

diffs (297 lines):

diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/add.c
--- a/sbin/gpt/add.c    Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/add.c    Wed Nov 27 01:47:53 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.19 2013/11/22 04:21:02 jnemeth Exp $");
+__RCSID("$NetBSD: add.c,v 1.20 2013/11/27 01:47:53 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -182,15 +182,10 @@
        gpt_write(fd, lbt);
        gpt_write(fd, tpg);
 
-#ifdef __FreeBSD__
-       printf("%sp%u added\n", device_name, i + 1);
-#endif
-#ifdef __NetBSD__
        printf("Partition added, use:\n");
        printf("\tdkctl %s addwedge <wedgename> %" PRIu64 " %" PRIu64
            " <type>\n", device_arg, map->map_start, map->map_size);
        printf("to create a wedge for it\n");
-#endif
 }
 
 int
diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/biosboot.c
--- a/sbin/gpt/biosboot.c       Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/biosboot.c       Wed Nov 27 01:47:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: biosboot.c,v 1.6 2013/04/13 18:25:56 jakllsch Exp $ */
+/*     $NetBSD: biosboot.c,v 1.7 2013/11/27 01:47:53 jnemeth Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$NetBSD: biosboot.c,v 1.6 2013/04/13 18:25:56 jakllsch Exp $");
+__RCSID("$NetBSD: biosboot.c,v 1.7 2013/11/27 01:47:53 jnemeth Exp $");
 #endif
 
 #include <sys/stat.h>
@@ -291,7 +291,6 @@
                start = 0;
                size = 0;
 
-#ifdef __NetBSD__
                /*
                 * If a dk wedge was specified, loader should be
                 * installed onto parent device
@@ -315,7 +314,6 @@
 #endif
        close:
                close(fd);
-#endif /* __NetBSD__*/
 
                fd = gpt_open(dev);
        next:
diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/gpt.c
--- a/sbin/gpt/gpt.c    Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/gpt.c    Wed Nov 27 01:47:53 2013 +0000
@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.23 2013/11/23 08:59:04 jnemeth Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.24 2013/11/27 01:47:53 jnemeth Exp $");
 #endif
 
 #include <sys/param.h>
@@ -49,12 +49,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef __NetBSD__
 #include <util.h>
 #include <ctype.h>
 #include <prop/proplib.h>
 #include <sys/drvctlio.h>
-#endif
 
 #include "map.h"
 #include "gpt.h"
@@ -241,40 +239,6 @@
        } while (c != 0);
 }
 
-#ifndef __NetBSD__
-void
-le_uuid_dec(void const *buf, uuid_t *uuid)
-{
-       u_char const *p;
-       int i;
-
-       p = buf;
-       uuid->time_low = le32dec(p);
-       uuid->time_mid = le16dec(p + 4);
-       uuid->time_hi_and_version = le16dec(p + 6);
-       uuid->clock_seq_hi_and_reserved = p[8];
-       uuid->clock_seq_low = p[9];
-       for (i = 0; i < _UUID_NODE_LEN; i++)
-               uuid->node[i] = p[10 + i];
-}
-
-void
-le_uuid_enc(void *buf, uuid_t const *uuid)
-{
-       u_char *p;
-       int i;
-
-       p = buf;
-       le32enc(p, uuid->time_low);
-       le16enc(p + 4, uuid->time_mid);
-       le16enc(p + 6, uuid->time_hi_and_version);
-       p[8] = uuid->clock_seq_hi_and_reserved;
-       p[9] = uuid->clock_seq_low;
-       for (i = 0; i < _UUID_NODE_LEN; i++)
-               p[10 + i] = uuid->node[i];
-}
-
-#endif
 int
 parse_uuid(const char *s, uuid_t *uuid)
 {
@@ -486,7 +450,6 @@
        return (0);
 }
 
-#ifdef __NetBSD__
 static int
 drvctl(const char *name, u_int *sector_size, off_t *media_size)
 {
@@ -569,7 +532,6 @@
        errno = EINVAL;
        return -1;
 }
-#endif
 
 static int
 gpt_gpt(int fd, off_t lba, int found)
@@ -682,19 +644,6 @@
        mode = readonly ? O_RDONLY : O_RDWR|O_EXCL;
 
        device_arg = dev;
-#ifdef __FreeBSD__
-       strlcpy(device_path, dev, sizeof(device_path));
-       if ((fd = open(device_path, mode)) != -1)
-               goto found;
-
-       snprintf(device_path, sizeof(device_path), "%s%s", _PATH_DEV, dev);
-       device_name = device_path + strlen(_PATH_DEV);
-       if ((fd = open(device_path, mode)) != -1)
-               goto found;
-       return (-1);
- found:
-#endif
-#ifdef __NetBSD__
        fd = opendisk(dev, mode, device_path, sizeof(device_path), 0);
        if (fd == -1)
                return -1;
@@ -702,7 +651,6 @@
                device_name = device_path + strlen(_PATH_DEV);
        else
                device_name = device_path;
-#endif
 
        if (fstat(fd, &sb) == -1)
                goto close;
@@ -713,10 +661,8 @@
                    ioctl(fd, DIOCGMEDIASIZE, &mediasz) == -1)
                        goto close;
 #endif
-#ifdef __NetBSD__
                if (drvctl(device_name, &secsz, &mediasz) == -1)
                        goto close;
-#endif
        } else {
                secsz = 512;    /* Fixed size for files. */
                if (sb.st_size % secsz) {
diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/gpt.h
--- a/sbin/gpt/gpt.h    Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/gpt.h    Wed Nov 27 01:47:53 2013 +0000
@@ -30,30 +30,15 @@
 #define        _GPT_H_
 
 #include <sys/endian.h>
-#ifdef __FreeBSD__
-#include <sys/gpt.h>
-/*
- * XXX struct gpt_hdr is not a multiple of 8 bytes in size and thus
- * contains padding we must not include in the size.
- */
-#define GPT_SIZE offsetof(struct gpt_hdr, padding)
-#endif
-#ifdef __NetBSD__
 #include <sys/disklabel_gpt.h>
 #define GPT_SIZE GPT_HDR_SIZE
 #define hdr_uuid hdr_guid
 #define ent_uuid ent_guid
-#endif
 
 #include <uuid.h>
 
-#ifdef __NetBSD__
 #define le_uuid_dec uuid_dec_le
 #define le_uuid_enc uuid_enc_le
-#else
-void   le_uuid_dec(void const *, uuid_t *);
-void   le_uuid_enc(void *, uuid_t const *);
-#endif
 int    parse_uuid(const char *, uuid_t *);
 
 struct mbr_part {
diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/label.c
--- a/sbin/gpt/label.c  Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/label.c  Wed Nov 27 01:47:53 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: label.c,v 1.12 2013/11/22 04:21:02 jnemeth Exp $");
+__RCSID("$NetBSD: label.c,v 1.13 2013/11/27 01:47:53 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -144,13 +144,8 @@
                gpt_write(fd, lbt);
                gpt_write(fd, tpg);
 
-#ifdef __FreeBSD__
-               printf("%sp%u labeled\n", device_name, m->map_index);
-#endif
-#ifdef __NetBSD__
                printf("partition %d on %s labeled %s\n", m->map_index,
                    device_name, name);
-#endif
        }
 }
 
diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/remove.c
--- a/sbin/gpt/remove.c Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/remove.c Wed Nov 27 01:47:53 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: remove.c,v 1.10 2013/11/22 04:21:02 jnemeth Exp $");
+__RCSID("$NetBSD: remove.c,v 1.11 2013/11/27 01:47:53 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -143,13 +143,8 @@
 
                gpt_write(fd, lbt);
                gpt_write(fd, tpg);
-#ifdef __FreeBSD__
-               printf("%sp%u removed\n", device_name, m->map_index);
-#endif
-#ifdef __NetBSD__
                printf("partition %d removed from %s\n", m->map_index,
                    device_name);
-#endif
        }
 }
 
diff -r ead869c2ade0 -r 745cc4f55d29 sbin/gpt/resize.c
--- a/sbin/gpt/resize.c Tue Nov 26 21:13:05 2013 +0000
+++ b/sbin/gpt/resize.c Wed Nov 27 01:47:53 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: resize.c,v 1.2 2013/11/22 03:50:05 jnemeth Exp $");
+__RCSID("$NetBSD: resize.c,v 1.3 2013/11/27 01:47:53 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -167,15 +167,10 @@
        gpt_write(fd, lbt);
        gpt_write(fd, tpg);
 
-#ifdef __FreeBSD__
-       printf("%sp%u resized\n", device_name, i + 1);
-#endif
-#ifdef __NetBSD__
        printf("Partition resized, use:\n");
        printf("\tdkctl %s addwedge <wedgename> %" PRIu64 " %" PRIu64
            " <type>\n", device_arg, map->map_start, newsize);
        printf("to create a wedge for it\n");
-#endif
 }
 
 int