diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 16:24:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:15 -0500 |
| commit | f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d (patch) | |
| tree | 8c6360be102dee63e893526ac7128e9cd52d362c /source4/lib/util.c | |
| parent | 59e739a2f9f4b10f5f6184ef397f034d09959f26 (diff) | |
| download | samba-f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d.tar.gz samba-f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d.tar.bz2 samba-f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d.zip | |
r884: convert samba4 to use [u]int32_t instead of [u]int32
metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)
Diffstat (limited to 'source4/lib/util.c')
| -rw-r--r-- | source4/lib/util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/util.c b/source4/lib/util.c index 0cb5258a64..a4be8f8bf8 100644 --- a/source4/lib/util.c +++ b/source4/lib/util.c @@ -426,10 +426,10 @@ BOOL is_ipaddress(const char *str) Interpret an internet address or name into an IP address in 4 byte form. ****************************************************************************/ -uint32 interpret_addr(const char *str) +uint32_t interpret_addr(const char *str) { struct hostent *hp; - uint32 res; + uint32_t res; if (strcmp(str,"0.0.0.0") == 0) return(0); @@ -454,7 +454,7 @@ uint32 interpret_addr(const char *str) putip((char *)&res,(char *)hp->h_addr); } - if (res == (uint32)-1) + if (res == (uint32_t)-1) return(0); return(res); @@ -467,7 +467,7 @@ uint32 interpret_addr(const char *str) struct in_addr *interpret_addr2(TALLOC_CTX *mem_ctx, const char *str) { struct in_addr *ret; - uint32 a = interpret_addr(str); + uint32_t a = interpret_addr(str); ret = talloc(mem_ctx, sizeof(struct in_addr)); if (!ret) return NULL; @@ -481,7 +481,7 @@ struct in_addr *interpret_addr2(TALLOC_CTX *mem_ctx, const char *str) BOOL is_zero_ip(struct in_addr ip) { - uint32 a; + uint32_t a; putip((char *)&a,(char *)&ip); return(a == 0); } @@ -503,7 +503,7 @@ void zero_ip(struct in_addr *ip) BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask) { - uint32 net1,net2,nmask; + uint32_t net1,net2,nmask; nmask = ntohl(mask.s_addr); net1 = ntohl(ip1.s_addr); |