Another clang warning...

[thirdparty/cups.git] / cups / ppd-emit.c

diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c
index 0b4f1c9950d11dfec4ad5d4d3451184b903f1ac8..b9b0e5ad083e64232efe5a7ffa75ac57c3641964 100644 (file)
--- a/cups/ppd-emit.c
+++ b/cups/ppd-emit.c
@@ -1,18 +1,13 @@
 /*
  * PPD code emission routines for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  *
  * PostScript is a trademark of Adobe Systems, Inc.
- *
- * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -20,12 +15,13 @@
  */
 
 #include "cups-private.h"
+#include "debug-internal.h"
 #include "ppd.h"
-#if defined(WIN32) || defined(__EMX__)
+#if defined(_WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
 #  include <unistd.h>
-#endif /* WIN32 || __EMX__ */
+#endif /* _WIN32 || __EMX__ */
 
 
 /*
@@ -328,11 +324,11 @@ ppdEmitFd(ppd_file_t    *ppd,             /* I - PPD file record */
 
     while (buflength > 0)
     {
-#ifdef WIN32
+#ifdef _WIN32
       if ((bytes = (ssize_t)write(fd, bufptr, (unsigned)buflength)) < 0)
 #else
       if ((bytes = write(fd, bufptr, buflength)) < 0)
-#endif /* WIN32 */
+#endif /* _WIN32 */
       {
         if (errno == EAGAIN || errno == EINTR)
          continue;
@@ -445,6 +441,9 @@ ppdEmitJCL(ppd_file_t *ppd,         /* I - PPD file record */
     * Clean up the job title...
     */
 
+    if (!title)
+      title = "Unknown";
+
     if ((ptr = strrchr(title, '/')) != NULL)
     {
      /*
@@ -494,6 +493,9 @@ ppdEmitJCL(ppd_file_t *ppd,         /* I - PPD file record */
     * issues with some printer's PJL implementations...
     */
 
+    if (!user)
+      user = "anonymous";
+
     snprintf(displaymsg, sizeof(displaymsg), "%d %s %s", job_id, user, temp);
 
    /*
@@ -836,7 +838,7 @@ ppdEmitString(ppd_file_t    *ppd,   /* I - PPD file record */
            *bufptr++ = *cptr++;
        }
       }
-      else
+      else if (choices[i]->code)
       {
        /*
         * Otherwise just copy the option code directly...
@@ -1069,7 +1071,7 @@ ppdEmitString(ppd_file_t    *ppd, /* I - PPD file record */
       DEBUG_printf(("2ppdEmitString: Offset in string is %d...",
                     (int)(bufptr - buffer)));
     }
-    else
+    else if (choices[i]->code)
     {
       strlcpy(bufptr, choices[i]->code, (size_t)(bufend - bufptr + 1));
       bufptr += strlen(bufptr);