[PATCH] SCSI logical and physical names for udev

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index fc44a9847c09f71e4a83e9401be9b9b9f0edbb77..65cbf42b511f341db3a12d69c8ea426f67d0f6c3 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -20,19 +20,22 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include <sysfs/libsysfs.h>
-#include <stddef.h>
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
 #define COMMENT_CHARACTER              '#'
 
-#define NAME_SIZE      100
-#define OWNER_SIZE     30
-#define GROUP_SIZE     30
-#define MODE_SIZE      8
+#define NAME_SIZE                      256
+#define OWNER_SIZE                     30
+#define GROUP_SIZE                     30
+#define MODE_SIZE                      8
+
+#define ACTION_SIZE                    30
+#define DEVPATH_SIZE                   255
+#define SUBSYSTEM_SIZE                 30
 
 /* length of public data */
 #define UDEVICE_LEN (offsetof(struct udevice, bus_id))
@@ -55,18 +58,6 @@ struct udevice {
        char kernel_name[NAME_SIZE];
 };
 
-#define strfieldcpy(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-#define strfieldcat(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncat(to, from, sizeof(to) - strlen(to) -1); \
-} while (0)
-
 extern int udev_add_device(char *path, char *subsystem, int fake);
 extern int udev_remove_device(char *path, char *subsystem);
 extern void udev_init_config(void);