ObjFW  Diff

Differences From Artifact [d5f21c75e8]:

To Artifact [54a3258015]:


188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203

204
205
206

207
208
209
210
211


212
213
214
215
216
217
218
219
220

221
222
223

224
225
226
227
228
229
230

231
232
233

234
235
236
237




238
239
240
241
242
243
244
245
246
	}
	if (node > UINT8_MAX) {
		[OFStdErr writeFormat: @"%@: --node out of range!\n",
				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}

	if (phaseString == nil) {
		[OFStdErr writeFormat: @"%@: --phase not specified!\n",
				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}
	@try {
		phase = [phaseString unsignedLongLongValueWithBase: 0];
	} @catch (OFInvalidFormatException *e) {
		[OFStdErr writeFormat: @"%@: Invalid format for --phase!\n",

				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}

	if (phase > 2) {
		[OFStdErr writeFormat: @"%@: --phase out of range!\n",
				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}



	if (rangeString == nil) {
		[OFStdErr writeFormat: @"%@: --range not specified!\n",
				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}
	rangeArray = [rangeString componentsSeparatedByString: @"-"];
	if (rangeArray.count != 2) {
		[OFStdErr writeFormat: @"%@: Invalid format for --range!\n",

				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}

	@try {
		rangeStart = [[rangeArray objectAtIndex: 0]
		    unsignedLongLongValueWithBase: 0];
		rangeEnd = [[rangeArray objectAtIndex: 1]
		    unsignedLongLongValueWithBase: 0];
	} @catch (OFInvalidFormatException *e) {
		[OFStdErr writeFormat: @"%@: Invalid format for --range!\n",

				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}

	if (rangeStart > UINT16_MAX || rangeEnd > UINT16_MAX) {
		[OFStdErr writeFormat: @"%@: --range out of range!\n",
				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];




	}

	configureInterface(optionsParser.remainingArguments.firstObject,
	    (uint16_t)network, (uint8_t)node, (uint8_t)phase,
	    (uint16_t)rangeStart, (uint16_t)rangeEnd);

	[OFApplication terminate];
}
@end







|
<
<
<
<
|
|
|
|
>
|
|
|
>
|
|
|
|
|
>
>

|
<
<
<
<
|
|
|
>
|
|
|
>
|
|
|
|
|
|
|
>
|
|
|
>
|
|
|
|
>
>
>
>









188
189
190
191
192
193
194
195




196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213




214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
	}
	if (node > UINT8_MAX) {
		[OFStdErr writeFormat: @"%@: --node out of range!\n",
				       [OFApplication programName]];
		[OFApplication terminateWithStatus: 1];
	}

	if (phaseString != nil) {




		@try {
			phase = [phaseString unsignedLongLongValueWithBase: 0];
		} @catch (OFInvalidFormatException *e) {
			[OFStdErr writeFormat:
			    @"%@: Invalid format for "@"--phase!\n",
			    [OFApplication programName]];
			[OFApplication terminateWithStatus: 1];
		}

		if (phase > 2) {
			[OFStdErr writeFormat: @"%@: --phase out of range!\n",
					       [OFApplication programName]];
			[OFApplication terminateWithStatus: 1];
		}
	} else
		phase = 2;

	if (rangeString != nil) {




		rangeArray = [rangeString componentsSeparatedByString: @"-"];
		if (rangeArray.count != 2) {
			[OFStdErr writeFormat:
			    @"%@: Invalid format for --range!\n",
			    [OFApplication programName]];
			[OFApplication terminateWithStatus: 1];
		}

		@try {
			rangeStart = [[rangeArray objectAtIndex: 0]
			    unsignedLongLongValueWithBase: 0];
			rangeEnd = [[rangeArray objectAtIndex: 1]
			    unsignedLongLongValueWithBase: 0];
		} @catch (OFInvalidFormatException *e) {
			[OFStdErr writeFormat:
			    @"%@: Invalid format for --range!\n",
			    [OFApplication programName]];
			[OFApplication terminateWithStatus: 1];
		}

		if (rangeStart > UINT16_MAX || rangeEnd > UINT16_MAX) {
			[OFStdErr writeFormat: @"%@: --range out of range!\n",
					       [OFApplication programName]];
			[OFApplication terminateWithStatus: 1];
		}
	} else {
		rangeStart = network;
		rangeEnd = network;
	}

	configureInterface(optionsParser.remainingArguments.firstObject,
	    (uint16_t)network, (uint8_t)node, (uint8_t)phase,
	    (uint16_t)rangeStart, (uint16_t)rangeEnd);

	[OFApplication terminate];
}
@end