From: Karel Zak <kzak@redhat.com>
Date: Mon, 9 Jul 2012 15:26:15 +0000 (+0200)
Subject: libblkid: cleanup _attribute__ usage
X-Git-Tag: v2.22-rc1~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=641e3e2061b7dcfe6fb556cddbb5ab13ad9b766e;p=thirdparty%2Futil-linux.git

libblkid: cleanup _attribute__ usage
---

diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index bceda33b66..f2151ac57d 100644
--- 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 086a56861d..08f1438fc1 100644
--- 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);