From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Wed, 12 Dec 2012 20:51:38 +0000 (+0000)
Subject: The XML output of ipptool contained empty dictionaries (STR #4136)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82b8237aa3fb93f3e13032961ed3cf7eeccd7e42;p=thirdparty%2Fcups.git

The XML output of ipptool contained empty dictionaries (STR #4136)



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10755 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 17ba0d3c76..c59c1ca548 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -7,6 +7,7 @@ CHANGES IN CUPS V1.6.2
 	- Security: All file, directory, user, and group settings are now stored
 	  in a separate cups-files.conf configuration file that cannot be set
 	  through the CUPS web interface or APIs (STR #4223)
+	- The XML output of ipptool contained empty dictionaries (STR #4136)
 	- The scheduler did not delete job control backup files (STR #4244)
 	- cupsGetPPD3 could return a local PPD instead of the correct remote
 	  PPD.
diff --git a/test/ipptool.c b/test/ipptool.c
index 470d809710..56d56df676 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -2299,8 +2299,7 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	puts("<key>StatusCode</key>");
 	print_xml_string("string", "skip");
 	puts("<key>ResponseAttributes</key>");
-	puts("<dict>");
-	puts("</dict>");
+	puts("<dict />");
       }
       else if (Output == _CUPS_OUTPUT_TEST)
 	puts("SKIP]");
@@ -3023,7 +3022,7 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
     }
 
     if (num_displayed > 0 && !Verbosity && response &&
-        (Output == _CUPS_OUTPUT_TEST || Output == _CUPS_OUTPUT_PLIST))
+        Output == _CUPS_OUTPUT_TEST)
     {
       for (attrptr = response->attrs;
 	   attrptr != NULL;
@@ -3784,8 +3783,11 @@ print_attr(ipp_attribute_t *attr,	/* I  - Attribute to print */
   {
     if (!attr->name || (group && *group != attr->group_tag))
     {
-      puts("</dict>");
-      puts("<dict>");
+      if (attr->group_tag != IPP_TAG_ZERO)
+      {
+	puts("</dict>");
+	puts("<dict>");
+      }
 
       if (group)
         *group = attr->group_tag;