From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 29 Aug 2018 15:50:22 +0000 (-0400)
Subject: Further simplify the logic in ippCopyAttribute.
X-Git-Tag: v2.3b6~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c0af2ec880814a1535ca4c70688de29b65854c;p=thirdparty%2Fcups.git

Further simplify the logic in ippCopyAttribute.
---

diff --git a/cups/ipp.c b/cups/ipp.c
index efcb01ce4a..f30d8428f5 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1514,12 +1514,11 @@ ippCopyAttribute(
 
     case IPP_TAG_INTEGER :
     case IPP_TAG_ENUM :
-        if ((dstattr = ippAddIntegers(dst, srcattr->group_tag, srctag, srcattr->name, srcattr->num_values, NULL)) != NULL)
-	  memcpy(dstattr->values, srcattr->values, (size_t)srcattr->num_values * sizeof(_ipp_value_t));
-        break;
-
     case IPP_TAG_BOOLEAN :
-        if ((dstattr = ippAddBooleans(dst, srcattr->group_tag, srcattr->name, srcattr->num_values, NULL)) != NULL)
+    case IPP_TAG_DATE :
+    case IPP_TAG_RESOLUTION :
+    case IPP_TAG_RANGE :
+        if ((dstattr = ipp_add_attr(dst, srcattr->name, srcattr->group_tag, srctag, srcattr->num_values)) != NULL)
 	  memcpy(dstattr->values, srcattr->values, (size_t)srcattr->num_values * sizeof(_ipp_value_t));
         break;
 
@@ -1554,23 +1553,6 @@ ippCopyAttribute(
 	}
         break;
 
-    case IPP_TAG_DATE :
-        if (srcattr->num_values != 1)
-          return (NULL);
-
-        dstattr = ippAddDate(dst, srcattr->group_tag, srcattr->name, srcattr->values[0].date);
-        break;
-
-    case IPP_TAG_RESOLUTION :
-        if ((dstattr = ippAddResolutions(dst, srcattr->group_tag, srcattr->name, srcattr->num_values, IPP_RES_PER_INCH, NULL, NULL)) != NULL)
-	  memcpy(dstattr->values, srcattr->values, (size_t)srcattr->num_values * sizeof(_ipp_value_t));
-        break;
-
-    case IPP_TAG_RANGE :
-        if ((dstattr = ippAddRanges(dst, srcattr->group_tag, srcattr->name, srcattr->num_values, NULL, NULL)) != NULL)
-	  memcpy(dstattr->values, srcattr->values, (size_t)srcattr->num_values * sizeof(_ipp_value_t));
-        break;
-
     case IPP_TAG_TEXTLANG :
     case IPP_TAG_NAMELANG :
         if ((dstattr = ippAddStrings(dst, srcattr->group_tag, (ipp_tag_t)(srctag | quickcopy), srcattr->name, srcattr->num_values, NULL, NULL)) == NULL)