[PATCH] Make udev/udevstart be one binary

[elogind.git] / extras / scsi_id / scsi_id.h

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index cb27e88a5f308707a558559c3060513908ee4c57..10599ebb5f8b75258feb5b04a85178fb33cf3f71 100644 (file)
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -27,11 +27,17 @@
 #define        MAX_NAME_LEN    72
 #define OFFSET (2 * sizeof(unsigned int))
 
+/*
+ * MAX_ATTR_LEN: maximum length of the result of reading a sysfs
+ * attribute.
+ */
+#define        MAX_ATTR_LEN    256
+
 /*
  * MAX_SERIAL_LEN: the maximum length of the serial number, including
  * added prefixes such as vendor and product (model) strings.
  */
-#define        MAX_SERIAL_LEN  128
+#define        MAX_SERIAL_LEN  256
 
 /*
  * MAX_BUFFER_LEN: maximum buffer size and line length used while reading
@@ -39,29 +45,14 @@
  */
 #define MAX_BUFFER_LEN 256
 
-static inline char *sysfs_get_attr(struct sysfs_class_device *dev,
-                                   const char *attr)
-{
-       struct dlist *attributes = NULL;
-
-       attributes = sysfs_get_classdev_attributes(dev);
-
-       if (attributes == NULL)
-               return NULL;
-
-       return sysfs_get_value_from_attributes(attributes, attr);
-}
-
-extern int scsi_get_serial (struct sysfs_class_device *scsi_dev,
-                           const char *devname, int page_code, char *serial,
-                           int len);
+extern int sysfs_get_attr(const char *devpath, const char *attr, char *value,
+                         size_t bufsize);
+extern int scsi_get_serial (struct sysfs_device *scsi_dev, const char
+                           *devname, int page_code, char *serial, int
+                           len);
 extern void log_message (int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
-#ifdef __KLIBC__
-#define makedev(major, minor)  ((major) << 8) | (minor)
-#endif
-
 #ifndef u8
 typedef unsigned char u8;
 #endif