spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update po converter to arc

pull/439/head
Li Linfeng 2019-10-10 17:39:20 +08:00
parent cb7a080f6f
commit cb2fbd0b8c
2 changed files with 155 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
macosx/POConverter.m
View File

@ -27,7 +27,6 @@
BOOL gIgnoreFuzzy; /*! -n cmdline arg, YES = ignore fuzzy entries */
int gDebugLevel; /*! -v cmdline arg, 0 = no console messages */
NSAutoreleasePool *gPool;
NSCharacterSet *gNewLineSet;
NSCharacterSet *gDelimitSet;
@ -50,7 +49,7 @@ static BOOL readLine(NSString *string, NSRange *range, NSString **outString)
/*! Scans data (from a po file) in ascii mode and gets the charset specification */
static NSStringEncoding getCharset(NSData *data)
{
NSString *string = [[[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding] autorelease];
NSString *string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
if (nil == string)
return 0;
@ -92,7 +91,7 @@ static NSStringEncoding getCharset(NSData *data)
}
if (gDebugLevel)
CFShow(line);
CFShow((__bridge CFTypeRef)(line));
break;
}
}
@ -282,13 +281,13 @@ static BOOL isSource(NSString *line, BOOL *containsNonKde)
static long convertData(NSData *data, NSStringEncoding encoding, NSFileHandle *ofh)
{
long numConverted = 0;
NSString *fileString = [[[NSString alloc] initWithData:data encoding:encoding] autorelease];
NSString *fileString = [[NSString alloc] initWithData:data encoding:encoding];
if (nil == fileString)
return 0;
BOOL notComment = YES;
NSString *line;
NSString **aString;
__strong NSString **aString;
NSRange range = NSMakeRange(0, 0);
long fileStringLength = [fileString length];
@ -379,7 +378,7 @@ static long convertData(NSData *data, NSStringEncoding encoding, NSFileHandle *o
++numConverted;
if (gDebugLevel>2 && *aString)
CFShow(*aString);
CFShow((__bridge CFTypeRef)(*aString));
}
else if (gDebugLevel)
CFShow((CFStringRef)[NSString stringWithFormat:@"Ignoring entry \"%@\"", *aString]);
@ -434,14 +433,12 @@ static void usage()
static void ctrl_c_handler(int sig)
{
fprintf(stderr, "\nGot Ctrl-C, cleaning up...\n");
[gPool release];
exit(1);
}
int main(int argc, const char **argv)
{
NSAutoreleasePool *gPool = [[NSAutoreleasePool alloc] init];
@autoreleasepool {
// Catch ctrl-c so we can release the autorelease pool
signal(SIGINT, ctrl_c_handler);
@ -561,7 +558,6 @@ int main(int argc, const char **argv)
break;
default:
printf("Destination file not overwritten.\n\n");
[gPool release];
exit(0);
}
}
@ -579,7 +575,6 @@ int main(int argc, const char **argv)
if (nil == ofh)
{
CFShow(@"***Could not write output. Please check if directory exists, and you have permissions.***");
[gPool release];
exit(1);
}
@ -587,7 +582,7 @@ int main(int argc, const char **argv)
CFShow((CFStringRef)[NSString stringWithFormat:@"poFile='%@', result='%@', ignoreFuzzy=%d, debugLevel=%d, silent=%d", poFilename, (resultFilename ? resultFilename : @"stdout"), gIgnoreFuzzy, gDebugLevel, isSilent]);
NSData *data = [NSData dataWithContentsOfMappedFile: poFilename];
NSMutableCharacterSet *newLineSet = [[[NSCharacterSet whitespaceAndNewlineCharacterSet] mutableCopy] autorelease];
NSMutableCharacterSet *newLineSet = [[NSCharacterSet whitespaceAndNewlineCharacterSet] mutableCopy];
[newLineSet formIntersectionWithCharacterSet:
[[NSCharacterSet whitespaceCharacterSet] invertedSet]];
gNewLineSet = newLineSet;
@ -608,7 +603,7 @@ int main(int argc, const char **argv)
if (gDebugLevel)
CFShow((CFStringRef)[NSString stringWithFormat:@"%ld entries converted.", numConverted]);
} while (NO);
}
[gPool release];
return 0;
}

10
macosx/celestia.xcodeproj/project.pbxproj
View File

@ -245,7 +245,7 @@
E5B48EBA0C22065E00C6FBD7 /* MacInputWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E5B48EB80C22065E00C6FBD7 /* MacInputWatcher.mm */; };
E5C9ADE10848FFEF0071B1EE /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5040B0602A47B91014901DC /* Carbon.framework */; };
E5CAABA70D3D7A08001926FC /* POSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CAABA60D3D7A08001926FC /* POSupport.cpp */; };
E5CC203709AA836E00CFFF2C /* POConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = E5CC203209AA834B00CFFF2C /* POConverter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
E5CC203709AA836E00CFFF2C /* POConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = E5CC203209AA834B00CFFF2C /* POConverter.m */; };
E5CC204709AA843300CFFF2C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5CC204509AA843300CFFF2C /* Localizable.strings */; };
E5D3E6550D1EA18A00214838 /* axisarrow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5D3E6530D1EA18A00214838 /* axisarrow.cpp */; };
E5D446660777291700A1577D /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5D446640777291700A1577D /* utf8.cpp */; };
@ -2475,7 +2475,7 @@
E5CC202C09AA829B00CFFF2C /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
@ -2491,7 +2491,7 @@
E5CC202E09AA829B00CFFF2C /* Universal_Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
@ -2511,7 +2511,7 @@
E5F9EC660D9EA6BE00A83FEF /* HDR_Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
@ -2531,7 +2531,7 @@
E5F9EC670D9EA6BE00A83FEF /* HDR_Universal_Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",