From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 9 Sep 2013 23:59:11 +0000 (+1000)
Subject: Merge branch 'logging-fix'
X-Git-Tag: libevdev-0.4~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0adb75e2eb4a1c8e59973a36eacfb3d42bccb0eb;p=platform%2Fupstream%2Flibevdev.git

Merge branch 'logging-fix'
---

0adb75e2eb4a1c8e59973a36eacfb3d42bccb0eb
diff --cc libevdev/libevdev.h
index 3d0b609,844a1eb..82142d6
--- a/libevdev/libevdev.h
+++ b/libevdev/libevdev.h
@@@ -349,10 -349,21 +349,21 @@@ int libevdev_new_from_fd(int fd, struc
   */
  void libevdev_free(struct libevdev *dev);
  
+ enum libevdev_log_priority {
+ 	LIBEVDEV_LOG_ERROR = 10,	/** cricitical errors and application bugs */
+ 	LIBEVDEV_LOG_INFO  = 20,	/** informational messages */
+ 	LIBEVDEV_LOG_DEBUG = 30,	/** debug information */
+ };
+ 
  /**
   * Logging function called by library-internal logging.
 - * This function is expected to treat it's input like printf would.
 + * This function is expected to treat its input like printf would.
   *
+  * @param priority Log priority of this message
+  * @param data User-supplied data pointer (see libevdev_set_log_function())
+  * @param file libevdev source code file generating this message
+  * @param line libevdev source code line generating this message
+  * @param func libevdev source code function generating this message
   * @param format printf-style format string
   * @param args List of arguments
   *