ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fdisk: use debug stuff from libfdisk 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-11-30 15:29:03 +01:00
parent d56a7c2330
commit f3744ac569
2 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdisks/Makemodule.am
View File

@ -25,8 +25,8 @@ fdisk_SOURCES = \
fdisks/utils.c \
fdisks/common.h
fdisk_LDADD = $(LDADD) libcommon.la
fdisk_CFLAGS = $(AM_CFLAGS)
fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la
fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir)
if BUILD_LIBBLKID
fdisk_CFLAGS += -I$(ul_libblkid_incdir)

46
fdisks/fdisk.h
View File

@ -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 */