ObjFW  Diff

Differences From Artifact [44e262af33]:

  • File utils/ofzip/ZIPArchive.m — part of check-in [c404c33cf1] at 2017-08-05 18:00:22 on branch trunk — OFZIPArchive: Don't require an OFSeekableStream This is now only necessary for reading and appending. (user: js size: 9743)

To Artifact [8a0017fc41]:

  • File utils/ofzip/ZIPArchive.m — part of check-in [b1356cb2f1] at 2017-08-06 20:10:25 on branch trunk — 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(). (user: js size: 9792)

163
164
165
166
167
168
169


170
171
172
173
174

175
176
177
178
179
180
181
				    [entry generalPurposeBitFlag]];

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


				[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]",







>
>
|
|
|
|
|
>







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])];
				}
			}

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