aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/blkid
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2006-01-30 23:09:20 +0000
committerEric Andersen <andersen@codepoet.org>2006-01-30 23:09:20 +0000
commit3496fdc9a573a424e34141cbe04250cc8df15e32 (patch)
treea78bfa0e539dcdbb024ed1acb9fba333dfacc228 /e2fsprogs/blkid
parenta68ea1cb93c29125bc4f30ddd415fca02249e010 (diff)
downloadbusybox-w32-3496fdc9a573a424e34141cbe04250cc8df15e32.tar.gz
busybox-w32-3496fdc9a573a424e34141cbe04250cc8df15e32.tar.bz2
busybox-w32-3496fdc9a573a424e34141cbe04250cc8df15e32.zip
hopefully the last of the annoying signed/unsigned and mixed type errors
Diffstat (limited to 'e2fsprogs/blkid')
-rw-r--r--e2fsprogs/blkid/probe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c
index 2aaa50885..36f7177b8 100644
--- a/e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/blkid/probe.c
@@ -340,7 +340,7 @@ static int probe_swap1(int fd,
340 /* arbitrary sanity check.. is there any garbage down there? */ 340 /* arbitrary sanity check.. is there any garbage down there? */
341 if (sws->sws_pad[32] == 0 && sws->sws_pad[33] == 0) { 341 if (sws->sws_pad[32] == 0 && sws->sws_pad[33] == 0) {
342 if (sws->sws_volume[0]) 342 if (sws->sws_volume[0])
343 blkid_set_tag(dev, "LABEL", sws->sws_volume, 343 blkid_set_tag(dev, "LABEL", (const char*)sws->sws_volume,
344 sizeof(sws->sws_volume)); 344 sizeof(sws->sws_volume));
345 if (sws->sws_uuid[0]) 345 if (sws->sws_uuid[0])
346 set_uuid(dev, sws->sws_uuid); 346 set_uuid(dev, sws->sws_uuid);
@@ -415,8 +415,8 @@ static int probe_ocfs(int fd __BLKID_ATTR((unused)),
415 else if (major >= 9) 415 else if (major >= 9)
416 blkid_set_tag(dev,"SEC_TYPE","ntocfs",sizeof("ntocfs")); 416 blkid_set_tag(dev,"SEC_TYPE","ntocfs",sizeof("ntocfs"));
417 417
418 blkid_set_tag(dev, "LABEL", ovl.label, ocfslabellen(ovl)); 418 blkid_set_tag(dev, "LABEL", (const char*)ovl.label, ocfslabellen(ovl));
419 blkid_set_tag(dev, "MOUNT", ovh.mount, ocfsmountlen(ovh)); 419 blkid_set_tag(dev, "MOUNT", (const char*)ovh.mount, ocfsmountlen(ovh));
420 set_uuid(dev, ovl.vol_id); 420 set_uuid(dev, ovl.vol_id);
421 return 0; 421 return 0;
422} 422}
@@ -431,7 +431,7 @@ static int probe_ocfs2(int fd __BLKID_ATTR((unused)),
431 431
432 osb = (struct ocfs2_super_block *)buf; 432 osb = (struct ocfs2_super_block *)buf;
433 433
434 blkid_set_tag(dev, "LABEL", osb->s_label, sizeof(osb->s_label)); 434 blkid_set_tag(dev, "LABEL", (const char*)osb->s_label, sizeof(osb->s_label));
435 set_uuid(dev, osb->s_uuid); 435 set_uuid(dev, osb->s_uuid);
436 return 0; 436 return 0;
437} 437}