@@ -56,45 +56,45 @@
 extern char **environ;
 #endif
 
 @interface OFProcess ()
 #ifndef OF_WINDOWS
-- (void)OF_getArgV: (char***)argv
-    forProgramName: (OFString*)programName
-      andArguments: (OFArray*)arguments;
-- (char**)OF_environmentForDictionary: (OFDictionary*)dictionary;
+- (void)OF_getArgV: (char ***)argv
+    forProgramName: (OFString *)programName
+      andArguments: (OFArray *)arguments;
+- (char **)OF_environmentForDictionary: (OFDictionary *)dictionary;
 #else
-- (of_char16_t*)OF_environmentForDictionary: (OFDictionary*)dictionary;
+- (of_char16_t *)OF_environmentForDictionary: (OFDictionary *)dictionary;
 #endif
 @end
 
 @implementation OFProcess
-+ (instancetype)processWithProgram: (OFString*)program
++ (instancetype)processWithProgram: (OFString *)program
 {
 	return [[[self alloc] initWithProgram: program] autorelease];
 }
 
-+ (instancetype)processWithProgram: (OFString*)program
-			 arguments: (OFArray*)arguments
++ (instancetype)processWithProgram: (OFString *)program
+			 arguments: (OFArray *)arguments
 {
 	return [[[self alloc] initWithProgram: program
 				    arguments: arguments] autorelease];
 }
 
-+ (instancetype)processWithProgram: (OFString*)program
-		       programName: (OFString*)programName
-			 arguments: (OFArray*)arguments
++ (instancetype)processWithProgram: (OFString *)program
+		       programName: (OFString *)programName
+			 arguments: (OFArray *)arguments
 {
 	return [[[self alloc] initWithProgram: program
 				  programName: programName
 				    arguments: arguments] autorelease];
 }
 
-+ (instancetype)processWithProgram: (OFString*)program
-		       programName: (OFString*)programName
-			 arguments: (OFArray*)arguments
-		       environment: (OFDictionary*)environment
++ (instancetype)processWithProgram: (OFString *)program
+		       programName: (OFString *)programName
+			 arguments: (OFArray *)arguments
+		       environment: (OFDictionary *)environment
 {
 	return [[[self alloc] initWithProgram: program
 				  programName: programName
 				    arguments: arguments
 				  environment: environment] autorelease];
@@ -103,41 +103,41 @@
 - init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithProgram: (OFString*)program
+- initWithProgram: (OFString *)program
 {
 	return [self initWithProgram: program
 			 programName: program
 			   arguments: nil
 			 environment: nil];
 }
 
-- initWithProgram: (OFString*)program
-	arguments: (OFArray*)arguments
+- initWithProgram: (OFString *)program
+	arguments: (OFArray *)arguments
 {
 	return [self initWithProgram: program
 			 programName: program
 			   arguments: arguments
 			 environment: nil];
 }
 
-- initWithProgram: (OFString*)program
-      programName: (OFString*)programName
-	arguments: (OFArray*)arguments
+- initWithProgram: (OFString *)program
+      programName: (OFString *)programName
+	arguments: (OFArray *)arguments
 {
 	return [self initWithProgram: program
 			 programName: program
 			   arguments: arguments
 			 environment: nil];
 }
 
-- initWithProgram: (OFString*)program
-      programName: (OFString*)programName
-	arguments: (OFArray*)arguments
-      environment: (OFDictionary*)environment
+- initWithProgram: (OFString *)program
+      programName: (OFString *)programName
+	arguments: (OFArray *)arguments
+      environment: (OFDictionary *)environment
 {
 	self = [super init];
 
 	@try {
 #ifndef OF_WINDOWS
@@ -336,33 +336,33 @@
 
 	[super dealloc];
 }
 
 #ifndef OF_WINDOWS
-- (void)OF_getArgV: (char***)argv
-    forProgramName: (OFString*)programName
-      andArguments: (OFArray*)arguments
+- (void)OF_getArgV: (char ***)argv
+    forProgramName: (OFString *)programName
+      andArguments: (OFArray *)arguments
 {
 	OFString *const *objects = [arguments objects];
 	size_t i, count = [arguments count];
 	of_string_encoding_t encoding;
 
-	*argv = [self allocMemoryWithSize: sizeof(char*)
+	*argv = [self allocMemoryWithSize: sizeof(char *)
 				    count: count + 2];
 
 	encoding = [OFLocalization encoding];
 
-	(*argv)[0] = (char*)[programName cStringWithEncoding: encoding];
+	(*argv)[0] = (char *)[programName cStringWithEncoding: encoding];
 
 	for (i = 0; i < count; i++)
 		(*argv)[i + 1] =
-		    (char*)[objects[i] cStringWithEncoding: encoding];
+		    (char *)[objects[i] cStringWithEncoding: encoding];
 
 	(*argv)[i + 1] = NULL;
 }
 
-- (char**)OF_environmentForDictionary: (OFDictionary*)environment
+- (char **)OF_environmentForDictionary: (OFDictionary *)environment
 {
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	char **envp;
 	size_t i, count;
 	of_string_encoding_t encoding;
@@ -371,11 +371,11 @@
 		return NULL;
 
 	encoding = [OFLocalization encoding];
 
 	count = [environment count];
-	envp = [self allocMemoryWithSize: sizeof(char*)
+	envp = [self allocMemoryWithSize: sizeof(char *)
 				   count: count + 1];
 
 	keyEnumerator = [environment keyEnumerator];
 	objectEnumerator = [environment objectEnumerator];
 
@@ -402,11 +402,11 @@
 	envp[i] = NULL;
 
 	return envp;
 }
 #else
-- (of_char16_t*)OF_environmentForDictionary: (OFDictionary*)environment
+- (of_char16_t *)OF_environmentForDictionary: (OFDictionary *)environment
 {
 	OFDataArray *env;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
 	const of_char16_t equal = '=';
@@ -447,11 +447,11 @@
 		return true;
 
 	return _atEndOfStream;
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void*)buffer
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer
 			  length: (size_t)length
 {
 #ifndef OF_WINDOWS
 	ssize_t ret;
 
@@ -488,11 +488,11 @@
 		_atEndOfStream = true;
 
 	return ret;
 }
 
-- (void)lowlevelWriteBuffer: (const void*)buffer
+- (void)lowlevelWriteBuffer: (const void *)buffer
 		     length: (size_t)length
 {
 #ifndef OF_WINDOWS
 	if (_writePipe[1] == -1 || _atEndOfStream)
 		@throw [OFWriteFailedException exceptionWithObject: self