1 files changed, 31 insertions, 32 deletions

diff --git a/src/common/mac/HTTPMultipartUpload.m b/src/common/mac/HTTPMultipartUpload.m
index 7fc474b8..48af299d 100644
--- a/src/common/mac/HTTPMultipartUpload.m
+++ b/src/common/mac/HTTPMultipartUpload.m
@@ -30,15 +30,15 @@
 #import "HTTPMultipartUpload.h"
 
 #import "GTMDefines.h"
-#import "util.h"
+#import "encoding_util.h"
 
-@interface HTTPMultipartUpload(PrivateMethods)
-- (NSString *)multipartBoundary;
+@interface HTTPMultipartUpload (PrivateMethods)
+- (NSString*)multipartBoundary;
 // Each of the following methods will append the starting multipart boundary,
 // but not the ending one.
-- (NSData *)formDataForKey:(NSString *)key value:(NSString *)value;
-- (NSData *)formDataForFileContents:(NSData *)contents name:(NSString *)name;
-- (NSData *)formDataForFile:(NSString *)file name:(NSString *)name;
+- (NSData*)formDataForKey:(NSString*)key value:(NSString*)value;
+- (NSData*)formDataForFileContents:(NSData*)contents name:(NSString*)name;
+- (NSData*)formDataForFile:(NSString*)file name:(NSString*)name;
 @end
 
 @implementation HTTPMultipartUpload
@@ -46,30 +46,29 @@
 #pragma mark -
 #pragma mark || Private ||
 //=============================================================================
-- (NSString *)multipartBoundary {
+- (NSString*)multipartBoundary {
   // The boundary has 27 '-' characters followed by 16 hex digits
-  return [NSString stringWithFormat:@"---------------------------%08X%08X",
-    rand(), rand()];
+  return [NSString
+      stringWithFormat:@"---------------------------%08X%08X", rand(), rand()];
 }
 
 //=============================================================================
-- (NSData *)formDataForKey:(NSString *)key value:(NSString *)value {
+- (NSData*)formDataForKey:(NSString*)key value:(NSString*)value {
   NSMutableData* data = [NSMutableData data];
   [self appendBoundaryData:data];
-  
-  NSString *escaped = PercentEncodeNSString(key);
-  NSString *fmt =
-    @"Content-Disposition: form-data; name=\"%@\"\r\n\r\n%@\r\n";
-  NSString *form = [NSString stringWithFormat:fmt, boundary_, escaped, value];
+
+  NSString* escaped = PercentEncodeNSString(key);
+  NSString* fmt = @"Content-Disposition: form-data; name=\"%@\"\r\n\r\n%@\r\n";
+  NSString* form = [NSString stringWithFormat:fmt, boundary_, escaped, value];
 
   [data appendData:[form dataUsingEncoding:NSUTF8StringEncoding]];
   return data;
 }
 
 //=============================================================================
-- (void)appendBoundaryData: (NSMutableData*)data {
-  NSString *fmt = @"--%@\r\n";
-  NSString *pre = [NSString stringWithFormat:fmt, boundary_];
+- (void)appendBoundaryData:(NSMutableData*)data {
+  NSString* fmt = @"--%@\r\n";
+  NSString* pre = [NSString stringWithFormat:fmt, boundary_];
 
   [data appendData:[pre dataUsingEncoding:NSUTF8StringEncoding]];
 }
@@ -78,7 +77,7 @@
 #pragma mark -
 #pragma mark || Public ||
 //=============================================================================
-- (id)initWithURL:(NSURL *)url {
+- (id)initWithURL:(NSURL*)url {
   if ((self = [super initWithURL:url])) {
     boundary_ = [[self multipartBoundary] retain];
     files_ = [[NSMutableDictionary alloc] init];
@@ -97,7 +96,7 @@
 }
 
 //=============================================================================
-- (void)setParameters:(NSDictionary *)parameters {
+- (void)setParameters:(NSDictionary*)parameters {
   if (parameters != parameters_) {
     [parameters_ release];
     parameters_ = [parameters copy];
@@ -105,22 +104,22 @@
 }
 
 //=============================================================================
-- (NSDictionary *)parameters {
+- (NSDictionary*)parameters {
   return parameters_;
 }
 
 //=============================================================================
-- (void)addFileAtPath:(NSString *)path name:(NSString *)name {
+- (void)addFileAtPath:(NSString*)path name:(NSString*)name {
   [files_ setObject:path forKey:name];
 }
 
 //=============================================================================
-- (void)addFileContents:(NSData *)data name:(NSString *)name {
+- (void)addFileContents:(NSData*)data name:(NSString*)name {
   [files_ setObject:data forKey:name];
 }
 
 //=============================================================================
-- (NSDictionary *)files {
+- (NSDictionary*)files {
   return files_;
 }
 
@@ -131,17 +130,17 @@
 
 //=============================================================================
 - (NSString*)contentType {
-  return [NSString stringWithFormat:@"multipart/form-data; boundary=%@",
-          boundary_];
+  return [NSString
+      stringWithFormat:@"multipart/form-data; boundary=%@", boundary_];
 }
 
 //=============================================================================
 - (NSData*)bodyData {
-  NSMutableData *postBody = [NSMutableData data];
+  NSMutableData* postBody = [NSMutableData data];
 
   // Add any parameters to the message
-  NSArray *parameterKeys = [parameters_ allKeys];
-  NSString *key;
+  NSArray* parameterKeys = [parameters_ allKeys];
+  NSString* key;
 
   NSInteger count = [parameterKeys count];
   for (NSInteger i = 0; i < count; ++i) {
@@ -151,8 +150,8 @@
   }
 
   // Add any files to the message
-  NSArray *fileNames = [files_ allKeys];
-  for (NSString *name in fileNames) {
+  NSArray* fileNames = [files_ allKeys];
+  for (NSString* name in fileNames) {
     // First append boundary
     [self appendBoundaryData:postBody];
     // Then the formdata
@@ -162,7 +161,7 @@
                        withFileOrData:fileOrData];
   }
 
-  NSString *epilogue = [NSString stringWithFormat:@"\r\n--%@--\r\n", boundary_];
+  NSString* epilogue = [NSString stringWithFormat:@"\r\n--%@--\r\n", boundary_];
   [postBody appendData:[epilogue dataUsingEncoding:NSUTF8StringEncoding]];
 
   return postBody;