X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Futil.h;h=964e70196aac90029e69389829af6ddfa71b1fef;hp=1d1b53bb5753043800f49bcf19e3400cae6521d7;hb=e7ea9c50e8eaab772206268739db2d59ba7bd709;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf

diff --git a/extras/volume_id/lib/util.h b/extras/volume_id/lib/util.h
index 1d1b53bb5..964e70196 100644
--- a/extras/volume_id/lib/util.h
+++ b/extras/volume_id/lib/util.h
@@ -23,10 +23,14 @@
 #include <byteswap.h>
 #include <syslog.h>
 
-#define err(format, arg...)	volume_id_log(LOG_ERR, __FILE__, __LINE__, format, ##arg)
-#define info(format, arg...)	volume_id_log(LOG_INFO, __FILE__, __LINE__, format, ##arg)
+#ifndef PACKED
+#define PACKED				__attribute__((packed))
+#endif
+
+#define err(format, arg...)	volume_id_log_fn(LOG_ERR, __FILE__, __LINE__, format, ##arg)
+#define info(format, arg...)	volume_id_log_fn(LOG_INFO, __FILE__, __LINE__, format, ##arg)
 #ifdef DEBUG
-#define dbg(format, arg...)	volume_id_log(LOG_DEBUG, __FILE__, __LINE__, format, ##arg)
+#define dbg(format, arg...)	volume_id_log_fn(LOG_DEBUG, __FILE__, __LINE__, format, ##arg)
 #else
 #define dbg(format, arg...)	do { } while (0)
 #endif
@@ -64,6 +68,7 @@ enum uuid_format {
 	UUID_DOS,
 	UUID_NTFS,
 	UUID_HFS,
+	UUID_FOURINT,
 };
 
 enum endian {