X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.h;h=573a2b60d78ee5fd25bb0c41db833cbf538eeacc;hp=cb27e88a5f308707a558559c3060513908ee4c57;hb=e996d97835c8d0728a9d4880e9e1f8f285cadf4b;hpb=eb7a964a7c66e5aff8147026a60c99258454b612

diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index cb27e88a5..573a2b60d 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -27,6 +27,12 @@
 #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.
@@ -39,19 +45,8 @@
  */
 #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 sysfs_get_attr(const char *devpath, const char *attr, char *value,
+			  size_t bufsize);
 extern int scsi_get_serial (struct sysfs_class_device *scsi_dev,
 			    const char *devname, int page_code, char *serial,
 			    int len);