From 7831279e58435b9e46b6f45aeceb958008de59c1 Mon Sep 17 00:00:00 2001 From: krw Date: Fri, 18 Feb 2022 17:45:43 +0000 Subject: [PATCH] Move prototypes for checklabel(), readlabel() and parselabel() into disklabel.c since editor.c and dkcksum.c have no need to know. --- sbin/disklabel/disklabel.c | 5 ++++- sbin/disklabel/extern.h | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 2c59f213e4c..e35430d9ffe 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.237 2021/06/24 21:11:40 jmc Exp $ */ +/* $OpenBSD: disklabel.c,v 1.238 2022/02/18 17:45:43 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -89,6 +89,9 @@ int quiet; int donothing; void makedisktab(FILE *, struct disklabel *); +int checklabel(struct disklabel *); +void readlabel(int); +int parselabel(void); void makelabel(char *, char *, struct disklabel *); int writelabel(int, struct disklabel *); int edit(struct disklabel *, int); diff --git a/sbin/disklabel/extern.h b/sbin/disklabel/extern.h index be9a8733ceb..fd32a753abc 100644 --- a/sbin/disklabel/extern.h +++ b/sbin/disklabel/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.33 2022/02/18 16:16:11 krw Exp $ */ +/* $OpenBSD: extern.h,v 1.34 2022/02/18 17:45:43 krw Exp $ */ /* * Copyright (c) 2003 Theo de Raadt @@ -20,15 +20,12 @@ #define GIG(x) (MEG(x) * 1024LL) u_short dkcksum(struct disklabel *); -int checklabel(struct disklabel *); char canonical_unit(struct disklabel *, char); double scale(u_int64_t, char, struct disklabel *); void display(FILE *, struct disklabel *, char, int); void display_partition(FILE *, struct disklabel *, int, char); int duid_parse(struct disklabel *, char *); -void readlabel(int); -int parselabel(void); int editor(int); int editor_allocspace(struct disklabel *); void mpsave(struct disklabel *); -- 2.20.1