summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2016-01-31 14:55:42 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2016-01-31 14:55:42 +0000
commitd9f3ffa251f93f688b7e0350d031304fb37d2b1f (patch)
tree668d596d7e287da27bf57de419806c10eb92f63a
parent9052d24377a0f0ee01cc096c3a5ba510774c4d46 (diff)
Move dump_block() declaration from io.h to io.c since it is not
used anywhere else. Remove declarations of non-existant kPatchType and init_partition_map().
-rw-r--r--sbin/pdisk/dump.c3
-rw-r--r--sbin/pdisk/dump.h3
-rw-r--r--sbin/pdisk/partition_map.h4
3 files changed, 4 insertions, 6 deletions
diff --git a/sbin/pdisk/dump.c b/sbin/pdisk/dump.c
index 273273e87db..9208402ecc4 100644
--- a/sbin/pdisk/dump.c
+++ b/sbin/pdisk/dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.c,v 1.70 2016/01/31 13:53:23 krw Exp $ */
+/* $OpenBSD: dump.c,v 1.71 2016/01/31 14:55:41 krw Exp $ */
/*
* dump.c - dumping partition maps
@@ -38,6 +38,7 @@
#include "io.h"
void adjust_value_and_compute_prefix(double *, int *);
+void dump_block(unsigned char *, int);
void dump_block_zero(struct partition_map *);
void dump_partition_entry(struct entry *, int, int, int);
int get_max_base_or_length(struct partition_map *);
diff --git a/sbin/pdisk/dump.h b/sbin/pdisk/dump.h
index e6bc7bfcf6a..d87cb481fdd 100644
--- a/sbin/pdisk/dump.h
+++ b/sbin/pdisk/dump.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.h,v 1.16 2016/01/29 14:54:38 krw Exp $ */
+/* $OpenBSD: dump.h,v 1.17 2016/01/31 14:55:41 krw Exp $ */
/*
* dump.h - dumping partition maps
@@ -30,7 +30,6 @@
#ifndef __dump__
#define __dump__
-void dump_block(unsigned char *, int);
void dump_partition_map(struct partition_map *);
void full_dump_partition_entry(struct partition_map *, int);
void full_dump_block_zero(struct partition_map *);
diff --git a/sbin/pdisk/partition_map.h b/sbin/pdisk/partition_map.h
index f40e4f277f7..daaa433a655 100644
--- a/sbin/pdisk/partition_map.h
+++ b/sbin/pdisk/partition_map.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: partition_map.h,v 1.39 2016/01/30 17:28:34 krw Exp $ */
+/* $OpenBSD: partition_map.h,v 1.40 2016/01/31 14:55:41 krw Exp $ */
/*
* partition_map.h - partition map routines
@@ -108,12 +108,10 @@ extern const char *kFreeType;
extern const char *kMapType;
extern const char *kUnixType;
extern const char *kHFSType;
-extern const char *kPatchType;
extern int lflag;
extern int rflag;
-struct partition_map *init_partition_map(char *);
struct partition_map *create_partition_map(int, char *, uint64_t, uint32_t);
struct partition_map *open_partition_map(int, char *, uint64_t, uint32_t);