X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.h;h=10599ebb5f8b75258feb5b04a85178fb33cf3f71;hb=062db23d5eb303ef49d2ff805381229932f44246;hp=8be492b75a717c4d427844822cbfb51f23deb0a2;hpb=c521693b54956c1f2dd0c0947c819b8570f6edaa;p=elogind.git

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 8be492b75..10599ebb5 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -22,21 +22,37 @@
  */
 
 #define dprintf(format, arg...) \
-	log_message(LOG_DEBUG, "%s: " format, __FUNCTION__, ## arg)
+	log_message(LOG_DEBUG, "%s: " format, __FUNCTION__ , ## arg)
 
 #define	MAX_NAME_LEN	72
 #define OFFSET (2 * sizeof(unsigned int))
 
-static inline char *sysfs_get_attr(struct sysfs_class_device *dev,
-				    const char *attr)
-{
-	return sysfs_get_value_from_attributes(dev->directory->attributes,
-					       attr);
-}
+/*
+ * 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	256
+
+/*
+ * MAX_BUFFER_LEN: maximum buffer size and line length used while reading
+ * the config file.
+ */
+#define MAX_BUFFER_LEN	256
 
-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)));
 
+#ifndef u8
+typedef unsigned char u8;
+#endif