X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-blkid.c;h=810f27d1d0c5532218633d79f3d9467bf2d45e85;hb=24078eebf3eb1fbda9a4a4478a85ea36c028f0ec;hp=db652f7a6e46e9bef91b1ce9f19c61d82c72b171;hpb=8a39439e08cf14c22e9f1ca5e69d1ba499075051;p=elogind.git diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index db652f7a6..810f27d1d 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -34,8 +34,7 @@ #include "efivars.h" #include "udev.h" -static void print_property(struct udev_device *dev, bool test, const char *name, const char *value) -{ +static void print_property(struct udev_device *dev, bool test, const char *name, const char *value) { char s[256]; s[0] = '\0'; @@ -182,8 +181,7 @@ static int find_gpt_root(struct udev_device *dev, blkid_probe pr, bool test) { return 0; } -static int probe_superblocks(blkid_probe pr) -{ +static int probe_superblocks(blkid_probe pr) { struct stat st; int rc; @@ -215,8 +213,7 @@ static int probe_superblocks(blkid_probe pr) return blkid_do_safeprobe(pr); } -static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool test) -{ +static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool test) { const char *root_partition; int64_t offset = 0; bool noraid = false; @@ -274,9 +271,9 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t if (err < 0) goto out; - log_debug("probe %s %sraid offset=%llu", + log_debug("probe %s %sraid offset=%"PRIu64, udev_device_get_devnode(dev), - noraid ? "no" : "", (unsigned long long) offset); + noraid ? "no" : "", offset); err = probe_superblocks(pr); if (err < 0)