diff --git a/image-hd.c b/image-hd.c index 5839154..3d14262 100644 --- a/image-hd.c +++ b/image-hd.c @@ -109,6 +109,26 @@ ct_assert(sizeof(struct gpt_partition_entry) == 128); #define GPT_PE_FLAG_HIDDEN (1ULL << 62) #define GPT_PE_FLAG_NO_AUTO (1ULL << 63) +static unsigned long long roundup(unsigned long long value, unsigned long long align) +{ + return ((value - 1)/align + 1) * align; +} + +static unsigned long long rounddown(unsigned long long value, unsigned long long align) +{ + return value - (value % align); +} + +static unsigned long long min_ull(unsigned long long x, unsigned long long y) +{ + return x < y ? x : y; +} + +static unsigned long long max_ull(unsigned long long x, unsigned long long y) +{ + return x > y ? x : y; +} + static unsigned long long partition_end(const struct partition *part) { return part->offset + part->size; @@ -659,26 +679,6 @@ static int hdimage_generate(struct image *image) return 0; } -static unsigned long long roundup(unsigned long long value, unsigned long long align) -{ - return ((value - 1)/align + 1) * align; -} - -static unsigned long long rounddown(unsigned long long value, unsigned long long align) -{ - return value - (value % align); -} - -static unsigned long long min_ull(unsigned long long x, unsigned long long y) -{ - return x < y ? x : y; -} - -static unsigned long long max_ull(unsigned long long x, unsigned long long y) -{ - return x > y ? x : y; -} - static bool image_has_hole_covering(const char *image, unsigned long long start, unsigned long long end) {