Skip to content

Commit 8ed0152

Browse files
committed
src: idiomatic c++
1 parent 3f2ef02 commit 8ed0152

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

src/impl-apple-cheetah.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ using v8::String;
77
using v8::Local;
88

99
const char* OSErrDescription(OSErr err) {
10-
1110
switch (err) {
1211
case nsvErr: return "Volume not found";
1312
case ioErr: return "I/O error.";

src/impl-apple-lion.cc

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ using v8::Local;
88
using v8::Value;
99

1010
Local<String> MYCFStringGetV8String(CFStringRef aString) {
11-
1211
if (aString == NULL) {
1312
return NanNew("");
1413
}
@@ -17,19 +16,18 @@ Local<String> MYCFStringGetV8String(CFStringRef aString) {
1716
CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8);
1817
char *buffer = (char *) malloc(maxSize);
1918

20-
if (CFStringGetCString(aString, buffer, maxSize, kCFStringEncodingUTF8)) {
21-
22-
Local<String> result = NanNew(buffer);
23-
free(buffer);
24-
25-
return result;
19+
if (!CFStringGetCString(aString, buffer, maxSize, kCFStringEncodingUTF8)) {
20+
return NanNew("");
2621
}
2722

28-
return NanNew("");
23+
Local<String> result = NanNew(buffer);
24+
free(buffer);
25+
26+
return result;
2927
}
3028

3129
NAN_METHOD(MethodGetVolumeName) {
32-
NanScope();
30+
NanScope();
3331

3432
NanAsciiString aPath(args[0]);
3533

@@ -40,14 +38,10 @@ NAN_METHOD(MethodGetVolumeName) {
4038
CFURLRef url = CFURLCreateWithFileSystemPath(NULL, volumePath, kCFURLPOSIXPathStyle, true);
4139

4240
if(CFURLCopyResourcePropertyForKey(url, kCFURLVolumeNameKey, &out, &error)) {
43-
4441
Local<String> result = MYCFStringGetV8String(out);
45-
4642
NanReturnValue(result);
4743
} else {
48-
4944
NanThrowError(MYCFStringGetV8String(CFErrorCopyDescription(error)));
50-
5145
NanReturnUndefined();
5246
}
5347
}

0 commit comments

Comments
 (0)