@@ -54,19 +54,19 @@
 
 @implementation ZIPArchive
 + (void)initialize
 {
 	if (self == [ZIPArchive class])
-		app = (OFZIP*)[[OFApplication sharedApplication] delegate];
+		app = (OFZIP *)[[OFApplication sharedApplication] delegate];
 }
 
-+ (instancetype)archiveWithStream: (OF_KINDOF(OFStream*))stream
++ (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream
 {
 	return [[[self alloc] initWithStream: stream] autorelease];
 }
 
-- initWithStream: (OF_KINDOF(OFStream*))stream
+- initWithStream: (OF_KINDOF(OFStream *))stream
 {
 	self = [super init];
 
 	@try {
 		_archive = [[OFZIPArchive alloc]
@@ -185,22 +185,22 @@
 
 		objc_autoreleasePoolPop(pool);
 	}
 }
 
-- (void)extractFiles: (OFArray OF_GENERIC(OFString*)*)files
+- (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files
 {
 	OFFileManager *fileManager = [OFFileManager defaultManager];
 	bool all = ([files count] == 0);
-	OFMutableSet OF_GENERIC(OFString*) *missing =
+	OFMutableSet OF_GENERIC(OFString *) *missing =
 	    [OFMutableSet setWithArray: files];
 
 	for (OFZIPArchiveEntry *entry in [_archive entries]) {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *fileName = [entry fileName];
 		OFString *outFileName = [fileName stringByStandardizingPath];
-		OFArray OF_GENERIC(OFString*) *pathComponents;
+		OFArray OF_GENERIC(OFString *) *pathComponents;
 		OFString *directory;
 		OFStream *stream;
 		OFFile *output;
 		uint64_t written = 0, size = [entry uncompressedSize];
 		int8_t percent = -1, newPercent;
@@ -325,11 +325,11 @@
 
 		app->_exitStatus = 1;
 	}
 }
 
-- (void)printFiles: (OFArray OF_GENERIC(OFString*)*)files
+- (void)printFiles: (OFArray OF_GENERIC(OFString *) *)files
 {
 	OFStream *stream;
 
 	if ([files count] < 1) {
 		[of_stderr writeLine: OF_LOCALIZED(@"print_no_file_specified",