X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=5b0355d0e9986722d3b32f348ab9035a61b53ac0;hp=fe18892de19fa2eeb3332ad526b8b5c533430cd9;hb=e39515ac1fd303c0263ee4bc91f2d7699617d0bf;hpb=9f8dfa19cfd2b502bf794f39a421cbb7c4cc0404

diff --git a/udev_utils.c b/udev_utils.c
index fe18892de..5b0355d0e 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -57,16 +57,16 @@ void udev_init_device(struct udevice *udev, const char* devpath, const char *sub
 	else if (strncmp(udev->devpath, "/class/", 7) == 0)
 		udev->type = 'c';
 
-	udev->mode = default_mode;
-	strfieldcpy(udev->owner, default_owner);
-	strfieldcpy(udev->group, default_group);
+	udev->mode = 0660;
+	strcpy(udev->owner, "root");
+	strcpy(udev->group, "root");
 }
 
-int kernel_release_satisfactory(int version, int patchlevel, int sublevel)
+int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
 {
-	static int kversion = 0;
-	static int kpatchlevel;
-	static int ksublevel;
+	static unsigned int kversion = 0;
+	static unsigned int kpatchlevel;
+	static unsigned int ksublevel;
 
 	if (kversion == 0) {
 		struct utsname uts;
@@ -200,11 +200,11 @@ size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
 
 void no_trailing_slash(char *path)
 {
-	int len;
+	size_t len;
 
 	len = strlen(path);
-	if (len > 0 && path[len-1] == '/')
-		path[len-1] = '\0';
+	while (len > 0 && path[len-1] == '/')
+		path[--len] = '\0';
 }
 
 struct files {