From: Michael R Sweet <msweet@msweet.org>
Date: Wed, 27 Dec 2023 21:47:16 +0000 (-0500)
Subject: Clean up.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f91a015945c3d9fbcdf895d864a20343da05562;p=thirdparty%2Fcups.git

Clean up.
---

diff --git a/CHANGES.md b/CHANGES.md
index 04905ec42f..a110a01377 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,20 +4,20 @@ CHANGES - OpenPrinting CUPS 2.5b1 - (TBA)
 Changes in CUPS v2.5b1 (TBA)
 ----------------------------
 
-- Added additional check on socket if `revents` from `poll()` returns POLLHUP
-  together with POLLIN or POLLOUT in `httpAddrConnect2()` (Issue #839)
 - Added `cupsDNSSD` APIs.
 - Added `cupsConcatString` and `cupsCopyString` string APIs.
 - Added a new argument value for `lpstat` argument '-W' - `successful` -
   to get successfully printed jobs (Issue #830)
-- Added new API for form, JSON, JWT, IPP, raster
+- Added new APIs for form, JSON, JWT, IPP, and raster setup.
 - Added OpenSSL support for `cupsHashData` (Issue #762)
 - Added warning if the device has to do IPP request for 'all,media-col-database'
   in separate requests (Issue #829)
 - Added driver filter to web interface (Issue #848)
 - Building with TLS support is now required - CUPS supports OpenSSL, GNUTLS
-  and LibreSSL
+  and LibreSSL.
 - Updated `cupsArray` APIs.
+- Updated `httpAddrConnect2()` to handle `POLLHUP` together with `POLLIN` or
+  `POLLOUT` (Issue #839)
 - Fixed crash in `scan_ps()` if incoming argument is NULL (Issue #831)
 - Fixed Digest authentication support (Issue #260)
 - Fixed delays in lpd backend (Issue #741)
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 436e21f8a2..2036d92c4b 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -312,7 +312,7 @@ httpAddrConnect2(
 	  {
 	    pfds[i].revents |= POLLERR;
 #  ifdef DEBUG
-	    DEBUG_printf(("1httpAddrConnect2: getsockopt returned: %d with error: %s", sres, strerror(serr)));
+	    DEBUG_printf("1httpAddrConnect2: getsockopt returned: %d with error: %s", sres, strerror(serr));
 #  endif
 	  }
 	  else if (pfds[i].revents && (pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN | POLLOUT)))
@@ -321,7 +321,6 @@ httpAddrConnect2(
 	  }
 	}
 
-
 	if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP)))
 	{
 	  *sock    = fds[i];