X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/72d45525d278776caacb293eba6282698592e874..d051056f921f465c487a85f9fa29a2324332bc4b:/lib/compat.c diff --git a/lib/compat.c b/lib/compat.c index 879f5487..5b7a2696 100644 --- a/lib/compat.c +++ b/lib/compat.c @@ -150,53 +150,10 @@ } #endif -#ifdef REPLACE_INET_NTOA - char *rep_inet_ntoa(struct in_addr ip) -{ - unsigned char *p = (unsigned char *)&ip.s_addr; - static char buf[18]; -#if WORDS_BIGENDIAN - snprintf(buf, 18, "%d.%d.%d.%d", - (int)p[0], (int)p[1], (int)p[2], (int)p[3]); -#else - snprintf(buf, 18, "%d.%d.%d.%d", - (int)p[3], (int)p[2], (int)p[1], (int)p[0]); -#endif - return buf; -} -#endif - -#ifdef REPLACE_INET_ATON - int inet_aton(const char *cp, struct in_addr *inp) -{ - unsigned int a1, a2, a3, a4; - unsigned long ret; - - if (strcmp(cp, "255.255.255.255") == 0) { - inp->s_addr = (unsigned) -1; - return 0; - } - - if (sscanf(cp, "%u.%u.%u.%u", &a1, &a2, &a3, &a4) != 4 || - a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255) { - return 0; - } - - ret = (a1 << 24) | (a2 << 16) | (a3 << 8) | a4; - - inp->s_addr = htonl(ret); - - if (inp->s_addr == (unsigned) -1) { - return 0; - } - return 1; -} -#endif - /* some systems don't take the 2nd argument */ int sys_gettimeofday(struct timeval *tv) { -#if HAVE_GETTIMEOFDAY_TZ +#ifdef HAVE_GETTIMEOFDAY_TZ return gettimeofday(tv, NULL); #else return gettimeofday(tv);