diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-20 00:02:15 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:52:06 +0100 |
| commit | 0500b87092540d300b4e021a0fb95ce16a44fbd2 (patch) | |
| tree | d8ff9774916e84dbc568f77edd4925b1f6b51735 /source4/lib/replace | |
| parent | 3e75f222bcdf114238cc4f2bcc61332dc059135f (diff) | |
| download | samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.gz samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.bz2 samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.zip | |
r26540: Revert my previous commit after concerns raised by Andrew.
(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/inet_ntop.c | 2 | ||||
| -rw-r--r-- | source4/lib/replace/inet_pton.c | 4 | ||||
| -rw-r--r-- | source4/lib/replace/timegm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/replace/inet_ntop.c b/source4/lib/replace/inet_ntop.c index 1b84cda6f0..fb3d8e90c8 100644 --- a/source4/lib/replace/inet_ntop.c +++ b/source4/lib/replace/inet_ntop.c @@ -74,7 +74,7 @@ rep_inet_ntop(int af, const void *src, char *dst, socklen_t size) static const char * inet_ntop4(const unsigned char *src, char *dst, socklen_t size) { - const char *fmt = "%u.%u.%u.%u"; + static const char *fmt = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; size_t len; diff --git a/source4/lib/replace/inet_pton.c b/source4/lib/replace/inet_pton.c index ea0fe6b78c..80e4865ef4 100644 --- a/source4/lib/replace/inet_pton.c +++ b/source4/lib/replace/inet_pton.c @@ -77,7 +77,7 @@ inet_pton4(src, dst) const char *src; unsigned char *dst; { - const char digits[] = "0123456789"; + static const char digits[] = "0123456789"; int saw_digit, octets, ch; unsigned char tmp[NS_INADDRSZ], *tp; @@ -131,7 +131,7 @@ inet_pton6(src, dst) const char *src; unsigned char *dst; { - const char xdigits_l[] = "0123456789abcdef", + static const char xdigits_l[] = "0123456789abcdef", xdigits_u[] = "0123456789ABCDEF"; unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp; const char *xdigits, *curtok; diff --git a/source4/lib/replace/timegm.c b/source4/lib/replace/timegm.c index 86f360bd3c..395c684e11 100644 --- a/source4/lib/replace/timegm.c +++ b/source4/lib/replace/timegm.c @@ -46,7 +46,7 @@ static int is_leap(unsigned y) time_t rep_timegm(struct tm *tm) { - const unsigned ndays[2][12] ={ + static const unsigned ndays[2][12] ={ {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}}; time_t res = 0; |