remove or make static various unused __-prefixed symbols

diff --git a/src/legacy/utmpx.c b/src/legacy/utmpx.c
index fa69f38..3c98367 100644 (file)
--- a/src/legacy/utmpx.c
+++ b/src/legacy/utmpx.c
@@ -36,7 +36,7 @@ void updwtmpx(const char *f, const struct utmpx *u)
 {
 }
 
-int __utmpxname(const char *f)
+static int __utmpxname(const char *f)
 {
        errno = ENOTSUP;
        return -1;

diff --git a/src/misc/setrlimit.c b/src/misc/setrlimit.c
index 7130d71..8a50f41 100644 (file)
--- a/src/misc/setrlimit.c
+++ b/src/misc/setrlimit.c
@@ -6,7 +6,7 @@
 #define MIN(a, b) ((a)<(b) ? (a) : (b))
 #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0)
 
-int __setrlimit(int resource, const struct rlimit *rlim)
+static int __setrlimit(int resource, const struct rlimit *rlim)
 {
        unsigned long k_rlim[2];
        struct rlimit tmp;

diff --git a/src/misc/syslog.c b/src/misc/syslog.c
index 60e9020..410709d 100644 (file)
--- a/src/misc/syslog.c
+++ b/src/misc/syslog.c
@@ -122,7 +122,7 @@ static void _vsyslog(int priority, const char *message, va_list ap)
        }
 }
 
-void __vsyslog(int priority, const char *message, va_list ap)
+static void __vsyslog(int priority, const char *message, va_list ap)
 {
        int cs;
        if (!(log_mask & LOG_MASK(priority&7)) || (priority&~0x3ff)) return;

diff --git a/src/network/dn_comp.c b/src/network/dn_comp.c
index a17d434..f0ccd16 100644 (file)
--- a/src/network/dn_comp.c
+++ b/src/network/dn_comp.c
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <resolv.h>
-#include "libc.h"
 
 /* RFC 1035 message compression */
 
@@ -55,7 +54,7 @@ static int match(int *offset, const unsigned char *base, const unsigned char *dn
        }
 }
 
-int __dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr)
+int dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr)
 {
        int i, j, n, m=0, offset, bestlen=0, bestoff;
        unsigned char lens[127];
@@ -106,5 +105,3 @@ int __dn_comp(const char *src, unsigned char *dst, int space, unsigned char **dn
        }
        return i;
 }
-
-weak_alias(__dn_comp, dn_comp);

diff --git a/src/network/res_query.c b/src/network/res_query.c
index 691ccb1..33543dc 100644 (file)
--- a/src/network/res_query.c
+++ b/src/network/res_query.c
@@ -2,7 +2,7 @@
 #include <netdb.h>
 #include "libc.h"
 
-int __res_query(const char *name, int class, int type, unsigned char *dest, int len)
+int res_query(const char *name, int class, int type, unsigned char *dest, int len)
 {
        unsigned char q[280];
        int ql = __res_mkquery(0, name, class, type, 0, 0, 0, q, sizeof q);
@@ -10,5 +10,4 @@ int __res_query(const char *name, int class, int type, unsigned char *dest, int
        return __res_send(q, ql, dest, len);
 }
 
-weak_alias(__res_query, res_query);
-weak_alias(__res_query, res_search);
+weak_alias(res_query, res_search);

diff --git a/src/stat/statvfs.c b/src/stat/statvfs.c
index 30d5879..66b9512 100644 (file)
--- a/src/stat/statvfs.c
+++ b/src/stat/statvfs.c
@@ -3,7 +3,7 @@
 #include "syscall.h"
 #include "libc.h"
 
-int __statfs(const char *path, struct statfs *buf)
+static int __statfs(const char *path, struct statfs *buf)
 {
        *buf = (struct statfs){0};
 #ifdef SYS_statfs64
@@ -13,7 +13,7 @@ int __statfs(const char *path, struct statfs *buf)
 #endif
 }
 
-int __fstatfs(int fd, struct statfs *buf)
+static int __fstatfs(int fd, struct statfs *buf)
 {
        *buf = (struct statfs){0};
 #ifdef SYS_fstatfs64

diff --git a/src/string/strdup.c b/src/string/strdup.c
index dd5f80c..d4c2744 100644 (file)
--- a/src/string/strdup.c
+++ b/src/string/strdup.c
@@ -1,13 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
-#include "libc.h"
 
-char *__strdup(const char *s)
+char *strdup(const char *s)
 {
        size_t l = strlen(s);
        char *d = malloc(l+1);
        if (!d) return NULL;
        return memcpy(d, s, l+1);
 }
-
-weak_alias(__strdup, strdup);

diff --git a/src/time/__tz.c b/src/time/__tz.c
index a2afe92..6f5257f 100644 (file)
--- a/src/time/__tz.c
+++ b/src/time/__tz.c
@@ -398,7 +398,7 @@ dst:
        UNLOCK(lock);
 }
 
-void __tzset()
+static void __tzset()
 {
        LOCK(lock);
        do_tzset();