X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fata_id%2Fata_id.c;h=9579db310593b5608493efd003808800f7265d8e;hb=1ac216b198e559163b1c81eca2f1c9a635d8e326;hp=1e99b9df9c6129e8e81490af2d10dd7038bc1795;hpb=46f01c6dc44ba516e42d5c8c1ada98a743f916f2;p=elogind.git

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 1e99b9df9..9579db310 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -62,14 +62,13 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-static void set_str(char *to, const unsigned char *from, int count)
+static void set_str(char *to, const char *from, size_t count)
 {
-	int i, j;
-	int len;
+	size_t i, j, len;
 
 	/* strip trailing whitespace */
 	len = strnlen(from, count);
-	while (isspace(from[len-1]))
+	while (len && isspace(from[len-1]))
 		len--;
 
 	/* strip leading whitespace */
@@ -139,9 +138,9 @@ int main(int argc, char *argv[])
 		goto close;
 	}
 
-	set_str(model, id.model, 40);
-	set_str(serial, id.serial_no, 20);
-	set_str(revision, id.fw_rev, 8);
+	set_str(model, (char *) id.model, 40);
+	set_str(serial, (char *) id.serial_no, 20);
+	set_str(revision, (char *) id.fw_rev, 8);
 
 	if (export) {
 		if ((id.config >> 8) & 0x80) {