Clean up Clang analyzer warnings.

[thirdparty/cups.git] / cups / dest-options.c

diff --git a/cups/dest-options.c b/cups/dest-options.c
index ee7bb83b7d901db90edc3cca6f254c1fdc503f94..f4d75105ccbbc2742d4efeda4d4a1cbdb20965a7 100644 (file)
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -28,7 +28,7 @@
 
 static void            cups_add_dconstres(cups_array_t *a, ipp_t *collection);
 static int             cups_collection_contains(ipp_t *test, ipp_t *match);
-static size_t          cups_collection_string(ipp_attribute_t *attr, char *buffer, size_t bufsize);
+static size_t          cups_collection_string(ipp_attribute_t *attr, char *buffer, size_t bufsize) _CUPS_NONNULL((1,2));
 static int             cups_compare_dconstres(_cups_dconstres_t *a,
                                               _cups_dconstres_t *b);
 static int             cups_compare_media_db(_cups_media_db_t *a,
@@ -1627,7 +1627,7 @@ cups_collection_string(
                  else
                    snprintf(temp, sizeof(temp), "%04u-%02u-%02uT%02u:%02u:%02u%c%02u%02u", year, date[2], date[3], date[4], date[5], date[6], date[8], date[9], date[10]);
 
-                 if (buffer && bufptr < bufend)
+                 if (bufptr < bufend)
                    strlcpy(bufptr, temp, (size_t)(bufend - bufptr + 1));
 
                  bufptr += strlen(temp);
@@ -1647,7 +1647,7 @@ cups_collection_string(
                  else
                     snprintf(temp, sizeof(temp), "%dx%d%s", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm");
 
-                 if (buffer && bufptr < bufend)
+                 if (bufptr < bufend)
                    strlcpy(bufptr, temp, (size_t)(bufend - bufptr + 1));
 
                  bufptr += strlen(temp);
@@ -1663,7 +1663,7 @@ cups_collection_string(
 
                  snprintf(temp, sizeof(temp), "%d-%d", lower, upper);
 
-                 if (buffer && bufptr < bufend)
+                 if (bufptr < bufend)
                    strlcpy(bufptr, temp, (size_t)(bufend - bufptr + 1));
 
                  bufptr += strlen(temp);
@@ -2522,8 +2522,10 @@ cups_get_media_db(http_t       *http,    /* I - Connection to destination */
       strlcpy(size->media, best->key, sizeof(size->media));
     else if (best->size_name)
       strlcpy(size->media, best->size_name, sizeof(size->media));
-    else
+    else if (pwg && pwg->pwg)
       strlcpy(size->media, pwg->pwg, sizeof(size->media));
+    else
+      strlcpy(size->media, "unknown", sizeof(size->media));
 
     size->width  = best->width;
     size->length = best->length;