diff options
| author | Karel Zak | 2013-02-11 16:38:20 +0100 |
|---|---|---|
| committer | Karel Zak | 2013-03-11 13:00:57 +0100 |
| commit | ec10aa6782ec9e4af719c43aa1f96a2b44f36a41 (patch) | |
| tree | 60469bb5510f06c8cdd3c74e89f22cf425d2a678 /fdisks/fdisk.h | |
| parent | libfdisk: add info about display units to context (diff) | |
| download | kernel-qcow2-util-linux-ec10aa6782ec9e4af719c43aa1f96a2b44f36a41.tar.gz kernel-qcow2-util-linux-ec10aa6782ec9e4af719c43aa1f96a2b44f36a41.tar.xz kernel-qcow2-util-linux-ec10aa6782ec9e4af719c43aa1f96a2b44f36a41.zip | |
fdisk: remove global unit variables
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.h')
| -rw-r--r-- | fdisks/fdisk.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h index 627b0d91f..378f17dd3 100644 --- a/fdisks/fdisk.h +++ b/fdisks/fdisk.h @@ -32,8 +32,14 @@ #define IS_EXTENDED(i) \ ((i) == EXTENDED || (i) == WIN98_EXTENDED || (i) == LINUX_EXTENDED) -#define cround(n) (display_in_cyl_units ? ((n)/units_per_sector)+1 : (n)) -#define scround(x) (((x)+units_per_sector-1)/units_per_sector) +extern void toggle_units(struct fdisk_context *cxt); + +static inline unsigned long +scround(struct fdisk_context *cxt, unsigned long num) +{ + unsigned long un = fdisk_context_get_units_per_sector(cxt); + return (num + un - 1) / un; +} struct partition { unsigned char boot_ind; /* 0x80 - active */ @@ -66,7 +72,6 @@ extern int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask, /* prototypes for fdisk.c */ extern char *line_ptr; -extern unsigned int display_in_cyl_units, units_per_sector; extern void fatal(struct fdisk_context *cxt, enum failure why); extern int get_partition(struct fdisk_context *cxt, int warn, int max); @@ -93,7 +98,6 @@ extern int get_partition_dflt(struct fdisk_context *cxt, int warn, int max, int #define PLURAL 0 #define SINGULAR 1 -extern const char * str_units(int); extern sector_t get_nr_sects(struct partition *p); |