Mirror some cleanup from CUPS 2.x.

OpenPrinting · Sep 10, 2024 · 302ceda · 302ceda
1 parent 7404a8e
commit 302ceda
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cups/json.c b/cups/json.c
@@ -10,6 +10,7 @@
 #include "cups-private.h"
 #include "json-private.h"
 #include <sys/stat.h>
+#include <fcntl.h>
 
 
 //
@@ -1160,7 +1161,7 @@ cupsJSONImportURL(
     if (!_cups_strcasecmp(httpGetField(http, HTTP_FIELD_CONNECTION), "close"))
     {
       httpClearFields(http);
-      if (!httpConnectAgain(http, 30000, NULL))
+      if (!httpConnectAgain(http, /*msec*/30000, /*cancel*/NULL))
       {
 	status = HTTP_STATUS_ERROR;
 	break;
@@ -1269,7 +1270,7 @@ cupsJSONImportURL(
   else
   {
     // Save the last HTTP status as a CUPS error...
-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(errno), false);
+    _cupsSetHTTPError(http, status);
   }
 
   // Flush any remaining data...

diff --git a/cups/jwt.c b/cups/jwt.c
@@ -14,7 +14,7 @@
 #  include <openssl/ecdsa.h>
 #  include <openssl/evp.h>
 #  include <openssl/rsa.h>
-#else
+#else // HAVE_GNUTLS
 #  include <gnutls/gnutls.h>
 #  include <gnutls/abstract.h>
 #  include <gnutls/crypto.h>

diff --git a/cups/jwt.h b/cups/jwt.h
@@ -1,7 +1,7 @@
 //
 // JSON Web Token API definitions for CUPS.
 //
-// Copyright © 2023 by OpenPrinting.
+// Copyright © 2023-2024 by OpenPrinting.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.