volume_id: add volume_id_get_* functions

[elogind.git] / extras / volume_id / lib / util.h

diff --git a/extras/volume_id/lib/util.h b/extras/volume_id/lib/util.h
index 1d1b53bb5753043800f49bcf19e3400cae6521d7..964e70196aac90029e69389829af6ddfa71b1fef 100644 (file)
--- a/extras/volume_id/lib/util.h
+++ b/extras/volume_id/lib/util.h
@@ -23,10 +23,14 @@
 #include <byteswap.h>
 #include <syslog.h>
 
 #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
 #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
 #else
 #define dbg(format, arg...)    do { } while (0)
 #endif


@@ -64,6 +68,7 @@ enum uuid_format {
        UUID_DOS,
        UUID_NTFS,
        UUID_HFS,
        UUID_DOS,
        UUID_NTFS,
        UUID_HFS,

+       UUID_FOURINT,

 };
 
 enum endian {
 };
 
 enum endian {