- remove functions marked as LEGACY in SUSv3 and use their modern counterparts.

diff --git a/archival/tar.c b/archival/tar.c
index 6a4c4e7e8b0dffdc6007904cfd51ce91469fc706..79c3595ac2088ac6b715781d1e494d1106869465 100644 (file)
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -217,7 +217,7 @@ static void writeLongname(int fd, int type, const char *name, int dir)
        size = strlen(name) + 1 + dir; /* GNU tar uses strlen+1 */
        /* + dir: account for possible '/' */
 
-       bzero(&header, sizeof(header));
+       memset(&header, 0, sizeof(header));
        strcpy(header.name, "././@LongLink");
        memcpy(header.mode, prefilled.mode, sizeof(prefilled));
        PUT_OCTAL(header.size, size);
@@ -231,7 +231,7 @@ static void writeLongname(int fd, int type, const char *name, int dir)
        xwrite(fd, name, size - dir);
        xwrite(fd, "/", dir);
        size = (-size) & (TAR_BLOCK_SIZE-1);
-       bzero(&header, size);
+       memset(&header, 0, size);
        xwrite(fd, &header, size);
 }
 #endif
@@ -246,7 +246,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
        if (sizeof(header) != 512)
                BUG_tar_header_size();
 
-       bzero(&header, sizeof(struct TarHeader));
+       memset(&header, 0, sizeof(struct TarHeader));
 
        strncpy(header.name, header_name, sizeof(header.name));
 
@@ -472,7 +472,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
                /* Pad the file up to the tar block size */
                /* (a few tricks here in the name of code size) */
                readSize = (-(int)readSize) & (TAR_BLOCK_SIZE-1);
-               bzero(bb_common_bufsiz1, readSize);
+               memset(bb_common_bufsiz1, 0, readSize);
                xwrite(tbInfo->tarFd, bb_common_bufsiz1, readSize);
        }
 
@@ -567,7 +567,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag,
                include = include->link;
        }
        /* Write two empty blocks to the end of the archive */
-       bzero(bb_common_bufsiz1, 2*TAR_BLOCK_SIZE);
+       memset(bb_common_bufsiz1, 0, 2*TAR_BLOCK_SIZE);
        xwrite(tbInfo.tarFd, bb_common_bufsiz1, 2*TAR_BLOCK_SIZE);
 
        /* To be pedantically correct, we would check if the tarball

diff --git a/docs/ipv4_ipv6.txt b/docs/ipv4_ipv6.txt
index e83db0dbd69e9421caa6ddc45b2dbc0897de4486..92010b59cda5cbf8773513e3543872ac3c6a8685 100644 (file)
--- a/docs/ipv4_ipv6.txt
+++ b/docs/ipv4_ipv6.txt
@@ -166,7 +166,7 @@ Modified IPv6-aware C code:
     int error;
 
     /* Get host address. Any type of address will do. */
-    bzero(&hints, sizeof(hints));
+    memset(&hints, 0, sizeof(hints));
     hints.ai_flags = AI_ALL|AI_ADDRCONFIG;
     hints.ai_socktype = SOCK_STREAM;