Selaa lähdekoodia

Rename "class" method arguments to "aClass" for C++ compatibility

Pierre-Olivier Latour 11 vuotta sitten
vanhempi
commit
08e58e4a5a
2 muutettua tiedostoa jossa 14 lisäystä ja 14 poistoa
  1. 4 4
      CGDWebServer/GCDWebServer.h
  2. 10 10
      CGDWebServer/GCDWebServer.m

+ 4 - 4
CGDWebServer/GCDWebServer.h

@@ -60,8 +60,8 @@ typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(GCDWebServerRequest* r
 @end
 @end
 
 
 @interface GCDWebServer (Handlers)
 @interface GCDWebServer (Handlers)
-- (void)addDefaultHandlerForMethod:(NSString*)method requestClass:(Class)class processBlock:(GCDWebServerProcessBlock)block;
-- (void)addHandlerForBasePath:(NSString*)basePath localPath:(NSString*)localPath indexFilename:(NSString*)indexFilename cacheAge:(NSUInteger)cacheAge;  // Base path is recursive and case-sensitive
-- (void)addHandlerForMethod:(NSString*)method path:(NSString*)path requestClass:(Class)class processBlock:(GCDWebServerProcessBlock)block;  // Path is case-insensitive
-- (void)addHandlerForMethod:(NSString*)method pathRegex:(NSString*)regex requestClass:(Class)class processBlock:(GCDWebServerProcessBlock)block;  // Regular expression is case-insensitive
+- (void)addDefaultHandlerForMethod:(NSString*)method requestClass:(Class)aClass processBlock:(GCDWebServerProcessBlock)block;
+- (void)addHandlerForBasePath:(NSString*)basePath localPath:(NSString*)localPath indexFilename:(NSString*)indexFilename cacheAge:(NSUInteger)age;  // Base path is recursive and case-sensitive
+- (void)addHandlerForMethod:(NSString*)method path:(NSString*)path requestClass:(Class)aClass processBlock:(GCDWebServerProcessBlock)block;  // Path is case-insensitive
+- (void)addHandlerForMethod:(NSString*)method pathRegex:(NSString*)regex requestClass:(Class)aClass processBlock:(GCDWebServerProcessBlock)block;  // Regular expression is case-insensitive
 @end
 @end

+ 10 - 10
CGDWebServer/GCDWebServer.m

@@ -336,10 +336,10 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
 
 
 @implementation GCDWebServer (Handlers)
 @implementation GCDWebServer (Handlers)
 
 
-- (void)addDefaultHandlerForMethod:(NSString*)method requestClass:(Class)class processBlock:(GCDWebServerProcessBlock)block {
+- (void)addDefaultHandlerForMethod:(NSString*)method requestClass:(Class)aClass processBlock:(GCDWebServerProcessBlock)block {
   [self addHandlerWithMatchBlock:^GCDWebServerRequest *(NSString* requestMethod, NSURL* requestURL, NSDictionary* requestHeaders, NSString* urlPath, NSDictionary* urlQuery) {
   [self addHandlerWithMatchBlock:^GCDWebServerRequest *(NSString* requestMethod, NSURL* requestURL, NSDictionary* requestHeaders, NSString* urlPath, NSDictionary* urlQuery) {
     
     
-    return ARC_AUTORELEASE([[class alloc] initWithMethod:requestMethod url:requestURL headers:requestHeaders path:urlPath query:urlQuery]);
+    return ARC_AUTORELEASE([[aClass alloc] initWithMethod:requestMethod url:requestURL headers:requestHeaders path:urlPath query:urlQuery]);
     
     
   } processBlock:block];
   } processBlock:block];
 }
 }
@@ -374,7 +374,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
   return [GCDWebServerDataResponse responseWithHTML:html];
   return [GCDWebServerDataResponse responseWithHTML:html];
 }
 }
 
 
-- (void)addHandlerForBasePath:(NSString*)basePath localPath:(NSString*)localPath indexFilename:(NSString*)indexFilename cacheAge:(NSUInteger)cacheAge {
+- (void)addHandlerForBasePath:(NSString*)basePath localPath:(NSString*)localPath indexFilename:(NSString*)indexFilename cacheAge:(NSUInteger)age {
   if ([basePath hasPrefix:@"/"] && [basePath hasSuffix:@"/"]) {
   if ([basePath hasPrefix:@"/"] && [basePath hasSuffix:@"/"]) {
 #if __has_feature(objc_arc)
 #if __has_feature(objc_arc)
     __unsafe_unretained GCDWebServer* server = self;
     __unsafe_unretained GCDWebServer* server = self;
@@ -410,7 +410,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
         }
         }
       }
       }
       if (response) {
       if (response) {
-        response.cacheControlMaxAge = cacheAge;
+        response.cacheControlMaxAge = age;
       } else {
       } else {
         response = [GCDWebServerResponse responseWithStatusCode:404];
         response = [GCDWebServerResponse responseWithStatusCode:404];
       }
       }
@@ -422,8 +422,8 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
   }
   }
 }
 }
 
 
-- (void)addHandlerForMethod:(NSString*)method path:(NSString*)path requestClass:(Class)class processBlock:(GCDWebServerProcessBlock)block {
-  if ([path hasPrefix:@"/"] && [class isSubclassOfClass:[GCDWebServerRequest class]]) {
+- (void)addHandlerForMethod:(NSString*)method path:(NSString*)path requestClass:(Class)aClass processBlock:(GCDWebServerProcessBlock)block {
+  if ([path hasPrefix:@"/"] && [aClass isSubclassOfClass:[GCDWebServerRequest class]]) {
     [self addHandlerWithMatchBlock:^GCDWebServerRequest *(NSString* requestMethod, NSURL* requestURL, NSDictionary* requestHeaders, NSString* urlPath, NSDictionary* urlQuery) {
     [self addHandlerWithMatchBlock:^GCDWebServerRequest *(NSString* requestMethod, NSURL* requestURL, NSDictionary* requestHeaders, NSString* urlPath, NSDictionary* urlQuery) {
       
       
       if (![requestMethod isEqualToString:method]) {
       if (![requestMethod isEqualToString:method]) {
@@ -432,7 +432,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
       if ([urlPath caseInsensitiveCompare:path] != NSOrderedSame) {
       if ([urlPath caseInsensitiveCompare:path] != NSOrderedSame) {
         return nil;
         return nil;
       }
       }
-      return ARC_AUTORELEASE([[class alloc] initWithMethod:requestMethod url:requestURL headers:requestHeaders path:urlPath query:urlQuery]);
+      return ARC_AUTORELEASE([[aClass alloc] initWithMethod:requestMethod url:requestURL headers:requestHeaders path:urlPath query:urlQuery]);
       
       
     } processBlock:block];
     } processBlock:block];
   } else {
   } else {
@@ -440,9 +440,9 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
   }
   }
 }
 }
 
 
-- (void)addHandlerForMethod:(NSString*)method pathRegex:(NSString*)regex requestClass:(Class)class processBlock:(GCDWebServerProcessBlock)block {
+- (void)addHandlerForMethod:(NSString*)method pathRegex:(NSString*)regex requestClass:(Class)aClass processBlock:(GCDWebServerProcessBlock)block {
   NSRegularExpression* expression = [NSRegularExpression regularExpressionWithPattern:regex options:NSRegularExpressionCaseInsensitive error:NULL];
   NSRegularExpression* expression = [NSRegularExpression regularExpressionWithPattern:regex options:NSRegularExpressionCaseInsensitive error:NULL];
-  if (expression && [class isSubclassOfClass:[GCDWebServerRequest class]]) {
+  if (expression && [aClass isSubclassOfClass:[GCDWebServerRequest class]]) {
     [self addHandlerWithMatchBlock:^GCDWebServerRequest *(NSString* requestMethod, NSURL* requestURL, NSDictionary* requestHeaders, NSString* urlPath, NSDictionary* urlQuery) {
     [self addHandlerWithMatchBlock:^GCDWebServerRequest *(NSString* requestMethod, NSURL* requestURL, NSDictionary* requestHeaders, NSString* urlPath, NSDictionary* urlQuery) {
       
       
       if (![requestMethod isEqualToString:method]) {
       if (![requestMethod isEqualToString:method]) {
@@ -451,7 +451,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
       if ([expression firstMatchInString:urlPath options:0 range:NSMakeRange(0, urlPath.length)] == nil) {
       if ([expression firstMatchInString:urlPath options:0 range:NSMakeRange(0, urlPath.length)] == nil) {
         return nil;
         return nil;
       }
       }
-      return ARC_AUTORELEASE([[class alloc] initWithMethod:requestMethod url:requestURL headers:requestHeaders path:urlPath query:urlQuery]);
+      return ARC_AUTORELEASE([[aClass alloc] initWithMethod:requestMethod url:requestURL headers:requestHeaders path:urlPath query:urlQuery]);
       
       
     } processBlock:block];
     } processBlock:block];
   } else {
   } else {