Changelog and style cleanup.

diff --git a/CHANGES-OPENPRINTING.md b/CHANGES-OPENPRINTING.md
index b74898bb3442c442ce2117e82446a28f48f2c497..ba613f2bf1d500eb1cd88bb3711129834e120577 100644 (file)
--- a/CHANGES-OPENPRINTING.md
+++ b/CHANGES-OPENPRINTING.md
@@ -11,6 +11,8 @@ Changes in CUPS v2.3.3op1
 - ippeveprinter now uses system sounds on macOS for Identify-Printer.
 - Updated ippfind to look for files in "~/Desktop" on Windows.
 - Updated ippfind to honor `SKIP-XXX` directives with `PAUSE`.
+- ipptool now supports DNS-SD URIs like `ipps://My%20Printer._ipps._tcp.local`
+  (Issue #5)
 - Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter.
 - Fixed DNS-SD name collision support in ippeveprinter.
 - Fixed compiler and code analyzer warnings.
@@ -23,3 +25,6 @@ Changes in CUPS v2.3.3op1
 - Fixed web interface device URI issue (Issue #4)
 - Fixed lp/lpr "printer/class not found" error reporting (Issue #6)
 - Fixed xinetd support for LPD clients (Issue #7)
+- Fixed libtool build issue (Issue #11)
+- Fixed a memory leak in the scheduler (Issue #12)
+- Fixed a potential integer overflow in the PPD hashing code (Issue #13)

diff --git a/cups/ipp-vars.c b/cups/ipp-vars.c
index ada3d3a17148ac8708dc526d1f371300bede412d..69efbd9aa0751ef28e61cc38a797a8255f90c100 100644 (file)
--- a/cups/ipp-vars.c
+++ b/cups/ipp-vars.c
@@ -12,8 +12,7 @@
  * Include necessary headers...
  */
 
-#include <cups/cups.h>
-#include <cups/cups-private.h>
+#include "cups-private.h"
 #include "ipp-private.h"
 #include "string-private.h"
 #include "debug-internal.h"
@@ -221,8 +220,8 @@ _ippVarsSet(_ipp_vars_t *v,         /* I - IPP variables */
 {
   if (!strcmp(name, "uri"))
   {
-    char               uri[1024];      /* New printer URI */
-    char               resolved[1024]; /* Resolved mDNS URI */
+    char       uri[1024];              /* New printer URI */
+    char       resolved[1024];         /* Resolved mDNS URI */
 
     if (strstr(value, "._tcp"))
     {
@@ -231,9 +230,7 @@ _ippVarsSet(_ipp_vars_t *v,         /* I - IPP variables */
       */
 
       if (!_httpResolveURI(value, resolved, sizeof(resolved), _HTTP_RESOLVE_DEFAULT, NULL, NULL))
-      {
         return (0);
-      }
 
       value = resolved;
     }