libblkid: cleanup _attribute__ usage

diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index bceda33b66ad126ab49f93f58e118ed251d1226c..f2151ac57db342ca16e68b6d36c8b9ae3c0ebf76 100644 (file)
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -435,9 +435,9 @@ extern int blkid_probe_set_value(blkid_probe pr, const char *name,
                 unsigned char *data, size_t len);
 extern int blkid_probe_vsprintf_value(blkid_probe pr, const char *name,
                 const char *fmt, va_list ap);
-       ;
+
 extern int blkid_probe_sprintf_value(blkid_probe pr, const char *name,
-                const char *fmt, ...) __attribute__ ((format (printf,3,4)));
+                const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
 
 extern int blkid_probe_set_magic(blkid_probe pr, blkid_loff_t offset,
                size_t len, unsigned char *magic);

diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 086a56861dc287671f0600e3825f5a32c570fd9f..08f1438fc19664aeaf1fbb5f816231bd601fbfd1 100644 (file)
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -75,14 +75,14 @@ extern const struct blkid_idinfo exfat_idinfo;
  */
 extern int blkid_probe_set_version(blkid_probe pr, const char *version);
 extern int blkid_probe_sprintf_version(blkid_probe pr, const char *fmt, ...)
-               __attribute__ ((format (printf, 2, 3)));
+               __attribute__ ((__format__ (__printf__, 2, 3)));
 
 extern int blkid_probe_set_label(blkid_probe pr, unsigned char *label, size_t len);
 extern int blkid_probe_set_utf8label(blkid_probe pr, unsigned char *label,
                 size_t len, int enc);
 extern int blkid_probe_sprintf_uuid(blkid_probe pr, unsigned char *uuid,
                 size_t len, const char *fmt, ...)
-               __attribute__ ((format (printf, 4, 5)));
+               __attribute__ ((__format__ (__printf__, 4, 5)));
 extern int blkid_probe_strncpy_uuid(blkid_probe pr, unsigned char *str, size_t len);
 
 extern int blkid_probe_set_uuid(blkid_probe pr, unsigned char *uuid);