diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-03-11 13:57:36 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-03-11 13:57:36 +0000 |
| commit | cb7f98ee7f57af247aacb94977c8f744a1d02eca (patch) | |
| tree | 9a777871fa4e4f9928ff960d52ffce2343df29d8 /cups/http-addrlist.c | |
| parent | c5b24bfa983a8b50262d8c3dd037e0181cfaae61 (diff) | |
| download | cups-cb7f98ee7f57af247aacb94977c8f744a1d02eca.tar.gz | |
Sync up with CUPS 1.7svn-r10893
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4216 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http-addrlist.c')
| -rw-r--r-- | cups/http-addrlist.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 709a0ad3d..6d859b658 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -3,7 +3,7 @@ * * HTTP address list routines for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -95,7 +95,7 @@ httpAddrConnect2( if (!sock) { errno = EINVAL; - _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); return (NULL); } @@ -309,9 +309,9 @@ httpAddrConnect2( if (!addrlist) #ifdef WIN32 - _cupsSetError(IPP_SERVICE_UNAVAILABLE, "Connection failed", 0); + _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, "Connection failed", 0); #else - _cupsSetError(IPP_SERVICE_UNAVAILABLE, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, strerror(errno), 0); #endif /* WIN32 */ return (addrlist); @@ -549,7 +549,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p if (!temp) { httpAddrFreeList(first); - _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); return (NULL); } @@ -584,7 +584,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p if (error == EAI_FAIL) cg->need_res_init = 1; - _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerror(error), 0); } #else @@ -708,7 +708,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p if (h_errno == NO_RECOVERY) cg->need_res_init = 1; - _cupsSetError(IPP_INTERNAL_ERROR, hstrerror(h_errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, hstrerror(h_errno), 0); } } #endif /* HAVE_GETADDRINFO */ @@ -748,7 +748,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p { httpAddrFreeList(first); - _cupsSetError(IPP_INTERNAL_ERROR, _("Unknown service name."), 1); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unknown service name."), 1); return (NULL); } @@ -771,7 +771,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t)); if (!temp) { - _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); httpAddrFreeList(first); return (NULL); } @@ -800,7 +800,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t)); if (!temp) { - _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); httpAddrFreeList(first); return (NULL); } @@ -832,7 +832,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t)); if (!temp) { - _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); httpAddrFreeList(first); return (NULL); } @@ -856,7 +856,7 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t)); if (!temp) { - _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0); + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), 0); httpAddrFreeList(first); return (NULL); } |