X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Futil.c;h=2a63efe8f7e2aa9793c3de8b361056306ef6fbee;hb=2aae673c967a16276c85726975cade2413b5307b;hp=c094661cccd12a602d15a427f37924472d750842;hpb=5caa40bea22b9ac07dbe667985d1b8556d8b6b80;p=elogind.git

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index c094661cc..2a63efe8f 100644
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -215,8 +215,8 @@ void volume_id_set_usage(struct volume_id *id, enum volume_id_usage usage_id)
 
 void volume_id_set_label_raw(struct volume_id *id, const uint8_t *buf, size_t count)
 {
-	if (count > sizeof(id->label))
-		count = sizeof(id->label);
+	if (count > sizeof(id->label_raw))
+		count = sizeof(id->label_raw);
 
 	memcpy(id->label_raw, buf, count);
 	id->label_raw_len = count;
@@ -353,33 +353,33 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 {
 	ssize_t buf_len;
 
-	info("get buffer off 0x%llx(%llu), len 0x%zx", (unsigned long long) off, (unsigned long long) off, len);
+	info("get buffer off 0x%llx(%llu), len 0x%zx\n", (unsigned long long) off, (unsigned long long) off, len);
 	/* check if requested area fits in superblock buffer */
 	if (off + len <= SB_BUFFER_SIZE) {
 		if (id->sbbuf == NULL) {
 			id->sbbuf = malloc(SB_BUFFER_SIZE);
 			if (id->sbbuf == NULL) {
-				dbg("error malloc");
+				dbg("error malloc\n");
 				return NULL;
 			}
 		}
 
 		/* check if we need to read */
 		if ((off + len) > id->sbbuf_len) {
-			info("read sbbuf len:0x%llx", (unsigned long long) (off + len));
+			info("read sbbuf len:0x%llx\n", (unsigned long long) (off + len));
 			if (lseek(id->fd, 0, SEEK_SET) < 0) {
-				dbg("lseek failed (%s)", strerror(errno));
+				dbg("lseek failed (%s)\n", strerror(errno));
 				return NULL;
 			}
 			buf_len = read(id->fd, id->sbbuf, off + len);
 			if (buf_len < 0) {
-				dbg("read failed (%s)", strerror(errno));
+				dbg("read failed (%s)\n", strerror(errno));
 				return NULL;
 			}
-			dbg("got 0x%zx (%zi) bytes", buf_len, buf_len);
+			dbg("got 0x%zx (%zi) bytes\n", buf_len, buf_len);
 			id->sbbuf_len = buf_len;
 			if ((size_t)buf_len < off + len) {
-				dbg("requested 0x%zx bytes, got only 0x%zx bytes", len, buf_len);
+				dbg("requested 0x%zx bytes, got only 0x%zx bytes\n", len, buf_len);
 				return NULL;
 			}
 		}
@@ -387,7 +387,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 		return &(id->sbbuf[off]);
 	} else {
 		if (len > SEEK_BUFFER_SIZE) {
-			dbg("seek buffer too small %d", SEEK_BUFFER_SIZE);
+			dbg("seek buffer too small %d\n", SEEK_BUFFER_SIZE);
 			return NULL;
 		}
 
@@ -395,28 +395,28 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 		if (id->seekbuf == NULL) {
 			id->seekbuf = malloc(SEEK_BUFFER_SIZE);
 			if (id->seekbuf == NULL) {
-				dbg("error malloc");
+				dbg("error malloc\n");
 				return NULL;
 			}
 		}
 
 		/* check if we need to read */
 		if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
-			info("read seekbuf off:0x%llx len:0x%zx", (unsigned long long) off, len);
+			info("read seekbuf off:0x%llx len:0x%zx\n", (unsigned long long) off, len);
 			if (lseek(id->fd, off, SEEK_SET) < 0) {
-				dbg("lseek failed (%s)", strerror(errno));
+				dbg("lseek failed (%s)\n", strerror(errno));
 				return NULL;
 			}
 			buf_len = read(id->fd, id->seekbuf, len);
 			if (buf_len < 0) {
-				dbg("read failed (%s)", strerror(errno));
+				dbg("read failed (%s)\n", strerror(errno));
 				return NULL;
 			}
-			dbg("got 0x%zx (%zi) bytes", buf_len, buf_len);
+			dbg("got 0x%zx (%zi) bytes\n", buf_len, buf_len);
 			id->seekbuf_off = off;
 			id->seekbuf_len = buf_len;
 			if ((size_t)buf_len < len) {
-				dbg("requested 0x%zx bytes, got only 0x%zx bytes", len, buf_len);
+				dbg("requested 0x%zx bytes, got only 0x%zx bytes\n", len, buf_len);
 				return NULL;
 			}
 		}