Move the inclusion of libdisk.h from sysinstall.h to the source files
that actually need it. This makes it easier for a platform porter to find the files that may need tweaking to support whatever MD specific partitioning is needed. It also helps to prevent that the libdisk API gets exposed and/or used where it's not needed.
This commit is contained in:
parent
8be373eedd
commit
498609452e
@ -44,6 +44,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/mount.h>
|
||||
#include <libdisk.h>
|
||||
#include <time.h>
|
||||
#include <kenv.h>
|
||||
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include <netinet/in_var.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <ctype.h>
|
||||
#include <libdisk.h>
|
||||
|
||||
/* how much to bias minor number for a given /dev/<ct#><un#>s<s#> slice */
|
||||
#define SLICE_DELTA (0x10000)
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
#include <inttypes.h>
|
||||
#include <libdisk.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/disklabel.h>
|
||||
|
||||
|
@ -50,6 +50,7 @@
|
||||
#undef MSDOSFS
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <libdisk.h>
|
||||
#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <termios.h>
|
||||
|
@ -37,6 +37,7 @@
|
||||
#include "sysinstall.h"
|
||||
#include <ctype.h>
|
||||
#include <inttypes.h>
|
||||
#include <libdisk.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include "ui_objects.h"
|
||||
#include "dir.h"
|
||||
#include "colors.h"
|
||||
#include "libdisk.h"
|
||||
#include "dist.h"
|
||||
|
||||
/*** Defines ***/
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include "sysinstall.h"
|
||||
#include <fcntl.h>
|
||||
#include <err.h>
|
||||
#include <libdisk.h>
|
||||
|
||||
int
|
||||
scan_block(int fd, daddr_t block)
|
||||
|
@ -44,6 +44,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/mount.h>
|
||||
#include <libdisk.h>
|
||||
#include <time.h>
|
||||
#include <kenv.h>
|
||||
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include <netinet/in_var.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <ctype.h>
|
||||
#include <libdisk.h>
|
||||
|
||||
/* how much to bias minor number for a given /dev/<ct#><un#>s<s#> slice */
|
||||
#define SLICE_DELTA (0x10000)
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
#include <inttypes.h>
|
||||
#include <libdisk.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/disklabel.h>
|
||||
|
||||
|
@ -50,6 +50,7 @@
|
||||
#undef MSDOSFS
|
||||
#include <sys/stat.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <libdisk.h>
|
||||
#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <termios.h>
|
||||
|
@ -37,6 +37,7 @@
|
||||
#include "sysinstall.h"
|
||||
#include <ctype.h>
|
||||
#include <inttypes.h>
|
||||
#include <libdisk.h>
|
||||
#include <sys/disklabel.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include "ui_objects.h"
|
||||
#include "dir.h"
|
||||
#include "colors.h"
|
||||
#include "libdisk.h"
|
||||
#include "dist.h"
|
||||
|
||||
/*** Defines ***/
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include "sysinstall.h"
|
||||
#include <fcntl.h>
|
||||
#include <err.h>
|
||||
#include <libdisk.h>
|
||||
|
||||
int
|
||||
scan_block(int fd, daddr_t block)
|
||||
|
Loading…
x
Reference in New Issue
Block a user