From bf4e288dfeccfbf6ceaee67377a416b5ba350768 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 14 Oct 2015 10:03:08 +1000
Subject: [PATCH] Mark log_msg and log_msg_va with attribute(printf)

And fix the warnings resulting from that.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/hidpp10.c           | 10 +++++-----
 src/libratbag-private.h |  6 ++++--
 src/libratbag.c         |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/hidpp10.c b/src/hidpp10.c
index be074a8b..aa8312d6 100644
--- a/src/hidpp10.c
+++ b/src/hidpp10.c
@@ -630,31 +630,31 @@ hidpp10_get_profile(struct hidpp10_device *dev, int8_t number, struct hidpp10_pr
 		switch (button->any.type) {
 		case PROFILE_BUTTON_TYPE_BUTTON:
 			log_raw(ratbag,
-				"Button %d: button %d\n",
+				"Button %zd: button %d\n",
 				i,
 				ffs(hidpp10_get_unaligned_u16le(&button->button.button_flags_lsb)));
 			break;
 		case PROFILE_BUTTON_TYPE_KEYS:
 			log_raw(ratbag,
-				"Button %d: key %d modifier %x\n",
+				"Button %zd: key %d modifier %x\n",
 				i,
 				button->keyboard_keys.key,
 				button->keyboard_keys.modifier_flags);
 			break;
 		case PROFILE_BUTTON_TYPE_SPECIAL:
 			log_raw(ratbag,
-				"Button %d: special %x\n",
+				"Button %zd: special %x\n",
 				i,
 				ffs(hidpp10_get_unaligned_u16le(&button->special.flags1)));
 			break;
 		case PROFILE_BUTTON_TYPE_CONSUMER_CONTROL:
 			log_raw(ratbag,
-				"Button %d: consumer: %x\n",
+				"Button %zd: consumer: %x\n",
 				i,
 				hidpp10_get_unaligned_u16(&button->consumer_control.consumer_control1));
 			break;
 		case PROFILE_BUTTON_TYPE_DISABLED:
-			log_raw(ratbag, "Button %d: disabled\n", i);
+			log_raw(ratbag, "Button %zd: disabled\n", i);
 			break;
 		default:
 			/* FIXME: this is the page number for the macro,
diff --git a/src/libratbag-private.h b/src/libratbag-private.h
index 7e251cdc..518e87d6 100644
--- a/src/libratbag-private.h
+++ b/src/libratbag-private.h
@@ -399,10 +399,12 @@ void
 log_msg_va(struct ratbag *ratbag,
 	   enum ratbag_log_priority priority,
 	   const char *format,
-	   va_list args);
+	   va_list args)
+	LIBRATBAG_ATTRIBUTE_PRINTF(3, 0);
 void log_msg(struct ratbag *ratbag,
 	enum ratbag_log_priority priority,
-	const char *format, ...);
+	const char *format, ...)
+	LIBRATBAG_ATTRIBUTE_PRINTF(3, 4);
 void
 log_buffer(struct ratbag *ratbag,
 	enum ratbag_log_priority priority,
diff --git a/src/libratbag.c b/src/libratbag.c
index 810bcf3d..bb29dc77 100644
--- a/src/libratbag.c
+++ b/src/libratbag.c
@@ -458,7 +458,7 @@ ratbag_register_driver(struct ratbag *ratbag, struct ratbag_driver *driver)
 	}
 
 	if (!driver->probe || !driver->remove) {
-		log_bug_libratbag(ratbag, "Driver %s is incomplete.\n");
+		log_bug_libratbag(ratbag, "Driver %s is incomplete.\n", driver->name);
 		return;
 	}
 	list_insert(&ratbag->drivers, &driver->link);