summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger2006-04-16 05:58:21 +0000
committerMike Frysinger2006-04-16 05:58:21 +0000
commit1a54030445c802b79491c286988ee4d25fdb9665 (patch)
tree146414467e7f28fe49270853815ea4d19efddb7d
parent4b7b8a58a19ec00a77670e9c86c568a50626e16e (diff)
downloadbusybox-1a54030445c802b79491c286988ee4d25fdb9665.zip
busybox-1a54030445c802b79491c286988ee4d25fdb9665.tar.gz
use memmove() instead of bcopy()
-rw-r--r--libbb/dump.c12
-rw-r--r--util-linux/fdisk.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/libbb/dump.c b/libbb/dump.c
index 9337ca6..9dcfb54 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -550,12 +550,12 @@ static void display(void)
switch (pr->bcnt) {
case 4:
- bcopy((char *) bp, (char *) &fval,
+ memmove((char *) &fval, (char *) bp,
sizeof(fval));
printf(pr->fmt, fval);
break;
case 8:
- bcopy((char *) bp, (char *) &dval,
+ memmove((char *) &dval, (char *) bp,
sizeof(dval));
printf(pr->fmt, dval);
break;
@@ -571,12 +571,12 @@ static void display(void)
printf(pr->fmt, (int) *bp);
break;
case 2:
- bcopy((char *) bp, (char *) &sval,
+ memmove((char *) &sval, (char *) bp,
sizeof(sval));
printf(pr->fmt, (int) sval);
break;
case 4:
- bcopy((char *) bp, (char *) &ival,
+ memmove((char *) &ival, (char *) bp,
sizeof(ival));
printf(pr->fmt, ival);
break;
@@ -604,12 +604,12 @@ static void display(void)
printf(pr->fmt, (unsigned int) * bp);
break;
case 2:
- bcopy((char *) bp, (char *) &sval,
+ memmove((char *) &sval, (char *) bp,
sizeof(sval));
printf(pr->fmt, (unsigned int) sval);
break;
case 4:
- bcopy((char *) bp, (char *) &ival,
+ memmove((char *) &ival, (char *) bp,
sizeof(ival));
printf(pr->fmt, ival);
break;
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index f119788..9701c46 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1322,7 +1322,7 @@ xbsd_write_bootstrap(void)
/* We need a backup of the disklabel (xbsd_dlabel might have changed). */
d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE];
- bcopy(d, &dl, sizeof(struct xbsd_disklabel));
+ memmove(&dl, d, sizeof(struct xbsd_disklabel));
/* The disklabel will be overwritten by 0's from bootxx anyway */
memset(d, 0, sizeof(struct xbsd_disklabel));
@@ -1339,7 +1339,7 @@ xbsd_write_bootstrap(void)
exit(EXIT_FAILURE);
}
- bcopy(&dl, d, sizeof(struct xbsd_disklabel));
+ memmove(d, &dl, sizeof(struct xbsd_disklabel));
#if defined (__powerpc__) || defined (__hppa__)
sector = 0;
@@ -1526,8 +1526,8 @@ xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d)
if (BSD_BBSIZE != read(fd, disklabelbuffer, BSD_BBSIZE))
fdisk_fatal(unable_to_read);
- bcopy(&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
- d, sizeof(struct xbsd_disklabel));
+ memmove(d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
+ sizeof(struct xbsd_disklabel));
if (d->d_magic != BSD_DISKMAGIC || d->d_magic2 != BSD_DISKMAGIC)
return 0;
@@ -1562,8 +1562,8 @@ xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d)
/* This is necessary if we want to write the bootstrap later,
otherwise we'd write the old disklabel with the bootstrap.
*/
- bcopy(d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
- sizeof(struct xbsd_disklabel));
+ memmove(&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
+ d, sizeof(struct xbsd_disklabel));
#if defined (__alpha__) && BSD_LABELSECTOR == 0
alpha_bootblock_checksum (disklabelbuffer);