ObjFW  Check-in [b1356cb2f1]

Overview
Comment:ofzip: Only print extraField if it exists

The extraField can now be nil - however, nil must not be used as a
parameter for OF_LOCALIZED().

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b1356cb2f1aaf6b63a67a98f3cb9e5dab611be1b270ae8d865a31fed10f42185
User & Date: js on 2017-08-06 20:10:25
Other Links: manifest | tags
Context
2017-08-06
20:27
OFZIPArchive: Fix uncompressed + data descriptor check-in: 4f04f5be98 user: js tags: trunk
20:10
ofzip: Only print extraField if it exists check-in: b1356cb2f1 user: js tags: trunk
20:06
OFZIPArchive: Improve signedness & range checks check-in: e86d11f124 user: js tags: trunk
Changes

Modified utils/ofzip/ZIPArchive.m from [44e262af33] to [8a0017fc41].

163
164
165
166
167
168
169


170
171
172
173
174






175
176
177
178
179
180
181
163
164
165
166
167
168
169
170
171





172
173
174
175
176
177
178
179
180
181
182
183
184







+
+
-
-
-
-
-
+
+
+
+
+
+







				    [entry generalPurposeBitFlag]];

				[of_stdout writeString: @"\t"];
				[of_stdout writeLine: OF_LOCALIZED(
				    @"list_general_purpose_bit_flag",
				    @"General purpose bit flag: %[gpbf]",
				    @"gpbf", GPBF)];

				if ([entry extraField] != nil) {
				[of_stdout writeString: @"\t"];
				[of_stdout writeLine: OF_LOCALIZED(
				    @"list_extra_field",
				    @"Extra field: %[extra]",
				    @"extra", [entry extraField])];
					[of_stdout writeString: @"\t"];
					[of_stdout writeLine: OF_LOCALIZED(
					    @"list_extra_field",
					    @"Extra field: %[extra]",
					    @"extra", [entry extraField])];
				}
			}

			if ([[entry fileComment] length] > 0) {
				[of_stdout writeString: @"\t"];
				[of_stdout writeLine: OF_LOCALIZED(
				    @"list_comment",
				    @"Comment: %[comment]",