cuong/GCDWebServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to latest clang-format

Browse Source 
[ci skip]
This commit is contained in:
Pierre-Olivier Latour
2017-06-22 08:09:41 -07:00
parent fbcf3fa96c
commit 2685819b61
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.clang-format
View File

@ -1,5 +1,4 @@
--- ---
Language: Cpp
BasedOnStyle: Google BasedOnStyle: Google
Standard: Cpp11 Standard: Cpp11
ColumnLimit: 0 ColumnLimit: 0
@ -10,4 +9,8 @@ AlwaysBreakBeforeMultilineStrings: false
AccessModifierOffset: -2 AccessModifierOffset: -2
ObjCSpaceBeforeProtocolList: true ObjCSpaceBeforeProtocolList: true
SortIncludes: false SortIncludes: false
---
Language: Cpp
---
Language: ObjC
... ...

2
GCDWebDAVServer/GCDWebDAVServer.m
View File

@ -233,7 +233,7 @@ static inline BOOL _IsMacFinder(GCDWebServerRequest* request) {
NSString* creationDateHeader = [request.headers objectForKey:@"X-GCDWebServer-CreationDate"]; NSString* creationDateHeader = [request.headers objectForKey:@"X-GCDWebServer-CreationDate"];
if (creationDateHeader) { if (creationDateHeader) {
NSDate* date = GCDWebServerParseISO8601(creationDateHeader); NSDate* date = GCDWebServerParseISO8601(creationDateHeader);
if (!date || ![[NSFileManager defaultManager] setAttributes:@{ NSFileCreationDate : date } ofItemAtPath:absolutePath error:&error]) { if (!date || ![[NSFileManager defaultManager] setAttributes:@{NSFileCreationDate : date} ofItemAtPath:absolutePath error:&error]) {
return [GCDWebServerErrorResponse responseWithServerError:kGCDWebServerHTTPStatusCode_InternalServerError underlyingError:error message:@"Failed setting creation date for directory \"%@\"", relativePath]; return [GCDWebServerErrorResponse responseWithServerError:kGCDWebServerHTTPStatusCode_InternalServerError underlyingError:error message:@"Failed setting creation date for directory \"%@\"", relativePath];
} }
} }

4
GCDWebServer/Requests/GCDWebServerFileRequest.m
View File

@ -85,14 +85,14 @@
NSString* creationDateHeader = [self.headers objectForKey:@"X-GCDWebServer-CreationDate"]; NSString* creationDateHeader = [self.headers objectForKey:@"X-GCDWebServer-CreationDate"];
if (creationDateHeader) { if (creationDateHeader) {
NSDate* date = GCDWebServerParseISO8601(creationDateHeader); NSDate* date = GCDWebServerParseISO8601(creationDateHeader);
if (!date || ![[NSFileManager defaultManager] setAttributes:@{ NSFileCreationDate : date } ofItemAtPath:_temporaryPath error:error]) { if (!date || ![[NSFileManager defaultManager] setAttributes:@{NSFileCreationDate : date} ofItemAtPath:_temporaryPath error:error]) {
return NO; return NO;
} }
} }
NSString* modifiedDateHeader = [self.headers objectForKey:@"X-GCDWebServer-ModifiedDate"]; NSString* modifiedDateHeader = [self.headers objectForKey:@"X-GCDWebServer-ModifiedDate"];
if (modifiedDateHeader) { if (modifiedDateHeader) {
NSDate* date = GCDWebServerParseRFC822(modifiedDateHeader); NSDate* date = GCDWebServerParseRFC822(modifiedDateHeader);
if (!date || ![[NSFileManager defaultManager] setAttributes:@{ NSFileModificationDate : date } ofItemAtPath:_temporaryPath error:error]) { if (!date || ![[NSFileManager defaultManager] setAttributes:@{NSFileModificationDate : date} ofItemAtPath:_temporaryPath error:error]) {
return NO; return NO;
} }
} }

2
Mac/main.m
View File

@ -425,7 +425,7 @@ int main(int argc, const char* argv[]) {
[options setObject:@"" forKey:GCDWebServerOption_BonjourName]; [options setObject:@"" forKey:GCDWebServerOption_BonjourName];
if (authenticationUser && authenticationPassword) { if (authenticationUser && authenticationPassword) {
[options setValue:authenticationRealm forKey:GCDWebServerOption_AuthenticationRealm]; [options setValue:authenticationRealm forKey:GCDWebServerOption_AuthenticationRealm];
[options setObject:@{ authenticationUser : authenticationPassword } forKey:GCDWebServerOption_AuthenticationAccounts]; [options setObject:@{authenticationUser : authenticationPassword} forKey:GCDWebServerOption_AuthenticationAccounts];
if ([authenticationMethod isEqualToString:@"Basic"]) { if ([authenticationMethod isEqualToString:@"Basic"]) {
[options setObject:GCDWebServerAuthenticationMethod_Basic forKey:GCDWebServerOption_AuthenticationMethod]; [options setObject:GCDWebServerAuthenticationMethod_Basic forKey:GCDWebServerOption_AuthenticationMethod];
} else if ([authenticationMethod isEqualToString:@"Digest"]) { } else if ([authenticationMethod isEqualToString:@"Digest"]) {

2
format-source.sh
View File

@ -3,7 +3,7 @@
# brew install clang-format # brew install clang-format
CLANG_FORMAT_VERSION=`clang-format -version | awk '{ print $3 }'` CLANG_FORMAT_VERSION=`clang-format -version | awk '{ print $3 }'`
if [[ "$CLANG_FORMAT_VERSION" != "4.0.0" ]]; then if [[ "$CLANG_FORMAT_VERSION" != "5.0.0" ]]; then
echo "Unsupported clang-format version" echo "Unsupported clang-format version"
exit 1 exit 1
fi fi