| 1 |
zzam 08/09/02 15:21:47 |
| 2 |
|
| 3 |
Added: udev-127-disable-logging-compile-fix.patch |
| 4 |
Log: |
| 5 |
Version bumped. |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-tuxonice-r6 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-fs/udev/files/udev-127-disable-logging-compile-fix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-127-disable-logging-compile-fix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-127-disable-logging-compile-fix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: udev-127-disable-logging-compile-fix.patch |
| 15 |
=================================================================== |
| 16 |
From: Kay Sievers <kay.sievers@××××.org> |
| 17 |
Date: Sat, 30 Aug 2008 21:07:50 +0000 (+0200) |
| 18 |
Subject: libudev: fix --disable-log |
| 19 |
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=4cf23685101ff9e1a15f47cb0da49a6ec10b8e27 |
| 20 |
|
| 21 |
libudev: fix --disable-log |
| 22 |
--- |
| 23 |
|
| 24 |
diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h |
| 25 |
index 7e7d1c6..6331f99 100644 |
| 26 |
--- a/udev/lib/libudev-private.h |
| 27 |
+++ b/udev/lib/libudev-private.h |
| 28 |
@@ -23,16 +23,6 @@ |
| 29 |
#include "libudev.h" |
| 30 |
#include "../udev.h" |
| 31 |
|
| 32 |
-struct udev_device { |
| 33 |
- int refcount; |
| 34 |
- struct udev *udev; |
| 35 |
- char *devpath; |
| 36 |
- char *devname; |
| 37 |
- char *subsystem; |
| 38 |
- struct list_head link_list; |
| 39 |
- struct list_head env_list; |
| 40 |
-}; |
| 41 |
- |
| 42 |
#ifdef USE_LOG |
| 43 |
#define log_dbg(udev, arg...) \ |
| 44 |
udev_log(udev, LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, ## arg) |
| 45 |
@@ -48,13 +38,21 @@ void udev_log(struct udev *udev, |
| 46 |
const char *format, ...) |
| 47 |
__attribute__ ((format(printf, 6, 7))); |
| 48 |
#else |
| 49 |
-static inline void udev_log(struct udev *udev, |
| 50 |
- int priority, const char *file, int line, const char *fn, |
| 51 |
- const char *format, ...) |
| 52 |
- __attribute__ ((format(printf, 6, 7))) {} |
| 53 |
+#define log_dbg(format, arg...) do { } while (0) |
| 54 |
+#define log_info(format, arg...) do { } while (0) |
| 55 |
+#define log_err(format, arg...) do { } while (0) |
| 56 |
#endif |
| 57 |
|
| 58 |
+struct udev_device { |
| 59 |
+ int refcount; |
| 60 |
+ struct udev *udev; |
| 61 |
+ char *devpath; |
| 62 |
+ char *devname; |
| 63 |
+ char *subsystem; |
| 64 |
+ struct list_head link_list; |
| 65 |
+ struct list_head env_list; |
| 66 |
+}; |
| 67 |
+ |
| 68 |
extern struct udev_device *device_init(struct udev *udev); |
| 69 |
extern ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *subsystem, size_t size); |
| 70 |
- |
| 71 |
#endif |
| 72 |
diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c |
| 73 |
index a5f33eb..a8a8a5a 100644 |
| 74 |
--- a/udev/lib/libudev.c |
| 75 |
+++ b/udev/lib/libudev.c |
| 76 |
@@ -22,6 +22,7 @@ |
| 77 |
#include <stdio.h> |
| 78 |
#include <stdlib.h> |
| 79 |
#include <stddef.h> |
| 80 |
+#include <stdarg.h> |
| 81 |
#include <unistd.h> |
| 82 |
#include <errno.h> |
| 83 |
#include <string.h> |
Archives