diff options
| author | Karel Zak | 2012-11-30 15:29:03 +0100 |
|---|---|---|
| committer | Karel Zak | 2013-03-11 11:20:40 +0100 |
| commit | f3744ac56952816bc12d398cf0dd5e5a65c48a31 (patch) | |
| tree | 16df90eac0b35072817ceaa76bb776d04c359755 /fdisks/fdisk.h | |
| parent | libfdisk: add basic library files (diff) | |
| download | kernel-qcow2-util-linux-f3744ac56952816bc12d398cf0dd5e5a65c48a31.tar.gz kernel-qcow2-util-linux-f3744ac56952816bc12d398cf0dd5e5a65c48a31.tar.xz kernel-qcow2-util-linux-f3744ac56952816bc12d398cf0dd5e5a65c48a31.zip | |
fdisk: use debug stuff from libfdisk
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.h')
| -rw-r--r-- | fdisks/fdisk.h | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h index 3cb04993e..14b0a7a6a 100644 --- a/fdisks/fdisk.h +++ b/fdisks/fdisk.h @@ -4,6 +4,12 @@ #include "c.h" +/* Let's temporary include private libfdisk header file. The final libfdisk.h + * maybe included when fdisk.c and libfdisk code will be completely spit. + */ +#include "fdiskP.h" + + #define DEFAULT_SECTOR_SIZE 512 #define MAX_SECTOR_SIZE 2048 #define SECTOR_SIZE 512 /* still used in BSD code */ @@ -32,46 +38,6 @@ #define cround(n) (display_in_cyl_units ? ((n)/units_per_sector)+1 : (n)) #define scround(x) (((x)+units_per_sector-1)/units_per_sector) -/* fdisk debugging flags/options */ -#define FDISK_DEBUG_INIT (1 << 1) -#define FDISK_DEBUG_CONTEXT (1 << 2) -#define FDISK_DEBUG_TOPOLOGY (1 << 3) -#define FDISK_DEBUG_GEOMETRY (1 << 4) -#define FDISK_DEBUG_LABEL (1 << 5) -#define FDISK_DEBUG_ALL 0xFFFF - -# define ON_DBG(m, x) do { \ - if ((FDISK_DEBUG_ ## m) & fdisk_debug_mask) { \ - x; \ - } \ - } while (0) - -# define DBG(m, x) do { \ - if ((FDISK_DEBUG_ ## m) & fdisk_debug_mask) { \ - fprintf(stderr, "%d: fdisk: %8s: ", getpid(), # m); \ - x; \ - } \ - } while (0) - -# define DBG_FLUSH do { \ - if (fdisk_debug_mask && \ - fdisk_debug_mask != FDISK_DEBUG_INIT) \ - fflush(stderr); \ - } while(0) - -static inline void __attribute__ ((__format__ (__printf__, 1, 2))) -dbgprint(const char *mesg, ...) -{ - va_list ap; - va_start(ap, mesg); - vfprintf(stderr, mesg, ap); - va_end(ap); - fputc('\n', stderr); -} - -extern int fdisk_debug_mask; -extern void fdisk_init_debug(int mask); - struct partition { unsigned char boot_ind; /* 0x80 - active */ unsigned char head; /* starting head */ |