Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 2685819

Browse files
committedJun 22, 2017
Updated to latest clang-format
[ci skip]
1 parent fbcf3fa commit 2685819

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed
 

‎.clang-format

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
Language: Cpp
32
BasedOnStyle: Google
43
Standard: Cpp11
54
ColumnLimit: 0
@@ -10,4 +9,8 @@ AlwaysBreakBeforeMultilineStrings: false
109
AccessModifierOffset: -2
1110
ObjCSpaceBeforeProtocolList: true
1211
SortIncludes: false
12+
---
13+
Language: Cpp
14+
---
15+
Language: ObjC
1316
...

‎GCDWebDAVServer/GCDWebDAVServer.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ - (GCDWebServerResponse*)performMKCOL:(GCDWebServerDataRequest*)request {
233233
NSString* creationDateHeader = [request.headers objectForKey:@"X-GCDWebServer-CreationDate"];
234234
if (creationDateHeader) {
235235
NSDate* date = GCDWebServerParseISO8601(creationDateHeader);
236-
if (!date || ![[NSFileManager defaultManager] setAttributes:@{ NSFileCreationDate : date } ofItemAtPath:absolutePath error:&error]) {
236+
if (!date || ![[NSFileManager defaultManager] setAttributes:@{NSFileCreationDate : date} ofItemAtPath:absolutePath error:&error]) {
237237
return [GCDWebServerErrorResponse responseWithServerError:kGCDWebServerHTTPStatusCode_InternalServerError underlyingError:error message:@"Failed setting creation date for directory \"%@\"", relativePath];
238238
}
239239
}

‎GCDWebServer/Requests/GCDWebServerFileRequest.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ - (BOOL)close:(NSError**)error {
8585
NSString* creationDateHeader = [self.headers objectForKey:@"X-GCDWebServer-CreationDate"];
8686
if (creationDateHeader) {
8787
NSDate* date = GCDWebServerParseISO8601(creationDateHeader);
88-
if (!date || ![[NSFileManager defaultManager] setAttributes:@{ NSFileCreationDate : date } ofItemAtPath:_temporaryPath error:error]) {
88+
if (!date || ![[NSFileManager defaultManager] setAttributes:@{NSFileCreationDate : date} ofItemAtPath:_temporaryPath error:error]) {
8989
return NO;
9090
}
9191
}
9292
NSString* modifiedDateHeader = [self.headers objectForKey:@"X-GCDWebServer-ModifiedDate"];
9393
if (modifiedDateHeader) {
9494
NSDate* date = GCDWebServerParseRFC822(modifiedDateHeader);
95-
if (!date || ![[NSFileManager defaultManager] setAttributes:@{ NSFileModificationDate : date } ofItemAtPath:_temporaryPath error:error]) {
95+
if (!date || ![[NSFileManager defaultManager] setAttributes:@{NSFileModificationDate : date} ofItemAtPath:_temporaryPath error:error]) {
9696
return NO;
9797
}
9898
}

‎Mac/main.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ int main(int argc, const char* argv[]) {
425425
[options setObject:@"" forKey:GCDWebServerOption_BonjourName];
426426
if (authenticationUser && authenticationPassword) {
427427
[options setValue:authenticationRealm forKey:GCDWebServerOption_AuthenticationRealm];
428-
[options setObject:@{ authenticationUser : authenticationPassword } forKey:GCDWebServerOption_AuthenticationAccounts];
428+
[options setObject:@{authenticationUser : authenticationPassword} forKey:GCDWebServerOption_AuthenticationAccounts];
429429
if ([authenticationMethod isEqualToString:@"Basic"]) {
430430
[options setObject:GCDWebServerAuthenticationMethod_Basic forKey:GCDWebServerOption_AuthenticationMethod];
431431
} else if ([authenticationMethod isEqualToString:@"Digest"]) {

‎format-source.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# brew install clang-format
44

55
CLANG_FORMAT_VERSION=`clang-format -version | awk '{ print $3 }'`
6-
if [[ "$CLANG_FORMAT_VERSION" != "4.0.0" ]]; then
6+
if [[ "$CLANG_FORMAT_VERSION" != "5.0.0" ]]; then
77
echo "Unsupported clang-format version"
88
exit 1
99
fi

0 commit comments

Comments
 (0)
This repository has been archived.