ObjFW  Check-in [aa89a3c059]

Overview
Comment:OFOptionsParser: Fix *isSpecifiedPtr not being set

It was not set for short options without arguments.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: aa89a3c059e4f8f94f10167a6c1a86896f2a08168776e528cdf5625caed4ae11
User & Date: js on 2015-12-05 21:03:55
Other Links: manifest | tags
Context
2015-12-05
21:23
of{http,zip}: Better documentation of long options check-in: 227351155f user: js tags: trunk
21:03
OFOptionsParser: Fix *isSpecifiedPtr not being set check-in: aa89a3c059 user: js tags: trunk
2015-12-03
21:44
OFOptionsParser.h: Add missing __unsafe_unretained check-in: 4d4a95aeb6 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFOptionsParser.m from [5e085ceea7] to [260ac6832a].

︙︙
237
238
239
240
241
242
243
244



245

246
247
248
249
250
251
252

		_index++;
		_subIndex = 0;
	}

	for (iter = _options;
	    iter->shortOption != '\0' || iter->longOption != nil; iter++) {
		if (iter->shortOption == _lastOption) {
			if (iter->hasArgument == 0)



				return _lastOption;


			if (_index >= [_arguments count])
				return ':';

			argument = [_arguments objectAtIndex: _index];
			argument = [argument substringWithRange:
			    of_range(_subIndex, [argument length] - _subIndex)];








|
>
>
>

>








237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256

		_index++;
		_subIndex = 0;
	}

	for (iter = _options;
	    iter->shortOption != '\0' || iter->longOption != nil; iter++) {
		if (iter->shortOption == _lastOption) {
			if (iter->hasArgument == 0) {
				if (iter->isSpecifiedPtr != NULL)
					*iter->isSpecifiedPtr = true;

				return _lastOption;
			}

			if (_index >= [_arguments count])
				return ':';

			argument = [_arguments objectAtIndex: _index];
			argument = [argument substringWithRange:
			    of_range(_subIndex, [argument length] - _subIndex)];
︙︙