From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 16 May 2019 02:38:07 +0000 (-0400)
Subject: Fix Windows build errors.
X-Git-Tag: v2.3rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bed16f192bdbff3029d0dfdcaf208352b18d121a;p=thirdparty%2Fcups.git

Fix Windows build errors.
---

diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index b5ba8fb6ef..954b910d05 100644
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -19,6 +19,7 @@
  */
 
 #include <cups/cups-private.h>
+#include <cups/debug-private.h>
 #if !CUPS_LITE
 #  include <cups/ppd-private.h>
 #endif /* !CUPS_LITE */
@@ -6013,15 +6014,21 @@ process_job(ippeve_job_t *job)		/* I - Job */
       goto error;
     }
 
-    if (asprintf(myenvp + myenvc, "CONTENT_TYPE=%s", job->format) > 0)
-      myenvc ++;
+    snprintf(val, sizeof(val), "CONTENT_TYPE=%s", job->format);
+    myenvp[myenvc ++] = strdup(val);
 
-    if (job->printer->device_uri && asprintf(myenvp + myenvc, "DEVICE_URI=%s", job->printer->device_uri) > 0)
-      myenvc ++;
+    if (job->printer->device_uri)
+    {
+      snprintf(val, sizeof(val), "DEVICE_URI=%s", job->printer->device_uri);
+      myenvp[myenvc ++] = strdup(val);
+    }
 
 #if !CUPS_LITE
-    if (job->printer->ppdfile && asprintf(myenvp + myenvc, "PPD=%s", job->printer->ppdfile) > 0)
-      myenvc ++;
+    if (job->printer->ppdfile)
+    {
+      snprintf(val, sizeof(val), "PPD=%s", job->printer->ppdfile);
+      myenvp[myenvc++] = strdup(val);
+    }
 #endif /* !CUPS_LITE */
 
     for (attr = ippFirstAttribute(job->printer->attrs); attr && myenvc < (int)(sizeof(myenvp) / sizeof(myenvp[0]) - 1); attr = ippNextAttribute(job->printer->attrs))