diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-20 07:26:13 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-20 07:26:13 +0000 |
| commit | 88f9aafc49f9c4feb55d1d10daa0e494c22946fc (patch) | |
| tree | b0084d66ec8925e4e7e04714ce2f59459413be93 /cups/http-addrlist.c | |
| parent | 321d8d57dacf00e4ae19558dc9444519f4d9ade1 (diff) | |
| download | cups-88f9aafc49f9c4feb55d1d10daa0e494c22946fc.tar.gz | |
Merge changes from CUPS 1.5b1-r9798.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3275 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http-addrlist.c')
| -rw-r--r-- | cups/http-addrlist.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 4c82a966c..3478f05b4 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -124,9 +124,9 @@ httpAddrConnect( val = 1; #ifdef WIN32 setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&val, - sizeof(val)); + sizeof(val)); #else - setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); + setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); #endif /* WIN32 */ #ifdef FD_CLOEXEC @@ -278,7 +278,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p } else #endif /* AF_LOCAL */ - if (!hostname || strcasecmp(hostname, "localhost")) + if (!hostname || _cups_strcasecmp(hostname, "localhost")) { #ifdef HAVE_GETADDRINFO struct addrinfo hints, /* Address lookup hints */ @@ -515,7 +515,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p * Detect some common errors and handle them sanely... */ - if (!addr && (!hostname || !strcasecmp(hostname, "localhost"))) + if (!addr && (!hostname || !_cups_strcasecmp(hostname, "localhost"))) { struct servent *port; /* Port number for service */ int portnum; /* Port number */ @@ -547,7 +547,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p return (NULL); } - if (hostname && !strcasecmp(hostname, "localhost")) + if (hostname && !_cups_strcasecmp(hostname, "localhost")) { /* * Unfortunately, some users ignore all of the warnings in the |