make these retry_write methods static so that they don't end up as symbols

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 63c5a63809bc92d7e5bd8239967c2fe9cb24ab74..1a21c03ebe2be6e67ef4c5b548495468ef630e6e 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -163,7 +163,8 @@ pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg)
    return Ver;
 }
                                                                        /*}}}*/
    return Ver;
 }
                                                                        /*}}}*/

-ssize_t retry_write(int fd, const void *buf, size_t count)
+static ssize_t
+retry_write(int fd, const void *buf, size_t count)

 {
    int Res;
    ssize_t i = 0;
 {
    int Res;
    ssize_t i = 0;

diff --git a/methods/rred.cc b/methods/rred.cc
index 38554464d3089a5e2ebee1e888092bf7ff5bae99..78d1595d4ec468e89a953df266563d94590ba2d7 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -227,7 +227,7 @@ struct EdCommand {
   char type;
 };
 #define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */
   char type;
 };
 #define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */

-ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) {
+static ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) {

        ssize_t Res;
        errno = 0;
        ssize_t i = 0;
        ssize_t Res;
        errno = 0;
        ssize_t i = 0;