diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-26 03:09:40 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-26 03:09:40 +0000 |
commit | 6d0bb1290723fef595c435e753ed12be1795dd54 (patch) | |
tree | 49d34d746db7a890f58b6f17d4327e2f42532bf4 | |
parent | a5dda4a7be05f4b1f11f51750b2715d3704bc143 (diff) | |
parent | 288b900956c1351e5a11f305d57419ca8f3a4efb (diff) | |
download | libcups-android10-mainline-release.tar.gz |
Snap for 5688406 from 288b900956c1351e5a11f305d57419ca8f3a4efb to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android10-mainline-releaseandroid10-mainline-a-release
Change-Id: Ic9fbf9d43934ee3dc5f09fc273f14f73e50f28bb
-rw-r--r-- | cups/ipp.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -4628,9 +4628,7 @@ ippSetValueTag( break; case IPP_TAG_NAME : - if (temp_tag != IPP_TAG_KEYWORD && temp_tag != IPP_TAG_URI && - temp_tag != IPP_TAG_URISCHEME && temp_tag != IPP_TAG_LANGUAGE && - temp_tag != IPP_TAG_MIMETYPE) + if (temp_tag != IPP_TAG_KEYWORD) return (0); (*attr)->value_tag = (ipp_tag_t)(IPP_TAG_NAME | ((*attr)->value_tag & IPP_TAG_CUPS_CONST)); @@ -4638,10 +4636,7 @@ ippSetValueTag( case IPP_TAG_NAMELANG : case IPP_TAG_TEXTLANG : - if (value_tag == IPP_TAG_NAMELANG && - (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD && - temp_tag != IPP_TAG_URI && temp_tag != IPP_TAG_URISCHEME && - temp_tag != IPP_TAG_LANGUAGE && temp_tag != IPP_TAG_MIMETYPE)) + if (value_tag == IPP_TAG_NAMELANG && (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD)) return (0); if (value_tag == IPP_TAG_TEXTLANG && temp_tag != IPP_TAG_TEXT) |