ObjFW  Diff

Differences From Artifact [84444b80b2]:

To Artifact [8d89f1d113]:


349
350
351
352
353
354
355
356
357


358
359
360
361

362
363
364

365
366
367
368
369
370
371
372
373
374
375
376

377
378
379

380
381
382

383
384
385

386
387
388
389
349
350
351
352
353
354
355


356
357
358
359
360

361

362

363
364
365
366
367
368
369
370
371
372
373
374

375
376
377

378
379
380

381
382
383

384
385
386
387
388







-
-
+
+



-
+
-

-
+











-
+


-
+


-
+


-
+




	OFString *old = fragment;
	fragment = [fragment_ copy];
	[old release];
}

- (OFString*)description
{
	OFMutableString *desc = [OFMutableString
	    stringWithFormat: @"%s://", [scheme cString]];
	OFMutableString *desc = [OFMutableString stringWithFormat: @"%@://",
								   scheme];
	BOOL needPort = YES;

	if (user != nil && password != nil)
		[desc appendFormat: @"%s:%s@", [user cString],
		[desc appendFormat: @"%@:%@@", user, password];
				    [password cString]];
	else if (user != nil)
		[desc appendFormat: @"%s@", [user cString]];
		[desc appendFormat: @"%@@", user];

	[desc appendString: host];

	if (([scheme isEqual: @"http"] && port == 80) ||
	    ([scheme isEqual: @"https"] && port == 443))
		needPort = NO;

	if (needPort)
		[desc appendFormat: @":%d", port];

	if (path != nil)
		[desc appendFormat: @"/%s", [path cString]];
		[desc appendFormat: @"/%@", path];

	if (parameters != nil)
		[desc appendFormat: @";%s", [parameters cString]];
		[desc appendFormat: @";%@", parameters];

	if (query != nil)
		[desc appendFormat: @"?%s", [query cString]];
		[desc appendFormat: @"?%@", query];

	if (fragment != nil)
		[desc appendFormat: @"#%s", [fragment cString]];
		[desc appendFormat: @"#%@", fragment];

	return desc;
}
@end