Const-ify some NSStrings.

CSCommandLineParser.m

@@ -27,27 +27,27 @@
 
 
 
-static NSString *NamesKey=@"NamesKey";
-static NSString *AllowedValuesKey=@"AllowedValuesKey";
-static NSString *DefaultValueKey=@"DefaultValueKey";
-static NSString *OptionTypeKey=@"OptionType";
-static NSString *DescriptionKey=@"DescriptionKey";
-static NSString *ArgumentDescriptionKey=@"ArgumentDescriptionKey";
-static NSString *AliasTargetKey=@"AliasTargetKey";
-static NSString *RequiredOptionsKey=@"RequiredOptionsKey";
-
-static NSString *NumberValueKey=@"NumberValue";
-static NSString *StringValueKey=@"StringValue";
-static NSString *ArrayValueKey=@"ArrayValue";
-
-static NSString *StringOptionType=@"StringOptionType";
-static NSString *MultipleChoiceOptionType=@"MultipleChoiceOptionType";
-static NSString *IntegerOptionType=@"IntegerOptionType";
-static NSString *FloatingPointOptionType=@"FloatingPointOptionType";
-static NSString *SwitchOptionType=@"SwitchOptionType";
-static NSString *HelpOptionType=@"HelpOptionType";
-static NSString *VersionOptionType=@"VersionOptionType";
-static NSString *AliasOptionType=@"AliasOptionType";
+static NSString *const NamesKey=@"NamesKey";
+static NSString *const AllowedValuesKey=@"AllowedValuesKey";
+static NSString *const DefaultValueKey=@"DefaultValueKey";
+static NSString *const OptionTypeKey=@"OptionType";
+static NSString *const DescriptionKey=@"DescriptionKey";
+static NSString *const ArgumentDescriptionKey=@"ArgumentDescriptionKey";
+static NSString *const AliasTargetKey=@"AliasTargetKey";
+static NSString *const RequiredOptionsKey=@"RequiredOptionsKey";
+
+static NSString *const NumberValueKey=@"NumberValue";
+static NSString *const StringValueKey=@"StringValue";
+static NSString *const ArrayValueKey=@"ArrayValue";
+
+static NSString *const StringOptionType=@"StringOptionType";
+static NSString *const MultipleChoiceOptionType=@"MultipleChoiceOptionType";
+static NSString *const IntegerOptionType=@"IntegerOptionType";
+static NSString *const FloatingPointOptionType=@"FloatingPointOptionType";
+static NSString *const SwitchOptionType=@"SwitchOptionType";
+static NSString *const HelpOptionType=@"HelpOptionType";
+static NSString *const VersionOptionType=@"VersionOptionType";
+static NSString *const AliasOptionType=@"AliasOptionType";
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED<1050
 @interface NSScanner (BuildKludge)

XADArchiveParser.h

@@ -227,7 +227,7 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext;
 -(NSData *)encodedPassword;
 -(const char *)encodedCStringPassword;
 
--(void)reportInterestingFileWithReason:(NSString *)reason,...;
+-(void)reportInterestingFileWithReason:(NSString *)reason,... NS_FORMAT_FUNCTION(1,2);
 
 
 

XADMacArchiveParser.h

@@ -21,9 +21,9 @@
 #import "XADArchiveParser.h"
 #import "CSStreamHandle.h"
 
-extern NSString *XADIsMacBinaryKey;
-extern NSString *XADMightBeMacBinaryKey;
-extern NSString *XADDisableMacForkExpansionKey;
+extern NSString *const XADIsMacBinaryKey;
+extern NSString *const XADMightBeMacBinaryKey;
+extern NSString *const XADDisableMacForkExpansionKey;
 
 @interface XADMacArchiveParser:XADArchiveParser
 {

XADMacArchiveParser.m

@@ -25,9 +25,9 @@
 #import "NSDateXAD.h"
 #import "CRC.h"
 
-NSString *XADIsMacBinaryKey=@"XADIsMacBinary";
-NSString *XADMightBeMacBinaryKey=@"XADMightBeMacBinary";
-NSString *XADDisableMacForkExpansionKey=@"XADDisableMacForkExpansionKey";
+NSString *const XADIsMacBinaryKey=@"XADIsMacBinary";
+NSString *const XADMightBeMacBinaryKey=@"XADMightBeMacBinary";
+NSString *const XADDisableMacForkExpansionKey=@"XADDisableMacForkExpansionKey";
 
 @implementation XADMacArchiveParser
 

XADString.h

@@ -23,50 +23,50 @@
 @class XADStringSource,UniversalDetector;
 
 
-extern NSString *XADUTF8StringEncodingName;
-extern NSString *XADASCIIStringEncodingName;
-
-extern NSString *XADISOLatin1StringEncodingName;
-extern NSString *XADISOLatin2StringEncodingName;
-extern NSString *XADISOLatin3StringEncodingName;
-extern NSString *XADISOLatin4StringEncodingName;
-extern NSString *XADISOLatin5StringEncodingName;
-extern NSString *XADISOLatin6StringEncodingName;
-extern NSString *XADISOLatin7StringEncodingName;
-extern NSString *XADISOLatin8StringEncodingName;
-extern NSString *XADISOLatin9StringEncodingName;
-extern NSString *XADISOLatin10StringEncodingName;
-extern NSString *XADISOLatin11StringEncodingName;
-extern NSString *XADISOLatin12StringEncodingName;
-extern NSString *XADISOLatin13StringEncodingName;
-extern NSString *XADISOLatin14StringEncodingName;
-extern NSString *XADISOLatin15StringEncodingName;
-extern NSString *XADISOLatin16StringEncodingName;
-
-extern NSString *XADShiftJISStringEncodingName;
-
-extern NSString *XADWindowsCP1250StringEncodingName;
-extern NSString *XADWindowsCP1251StringEncodingName;
-extern NSString *XADWindowsCP1252StringEncodingName;
-extern NSString *XADWindowsCP1253StringEncodingName;
-extern NSString *XADWindowsCP1254StringEncodingName;
-
-extern NSString *XADMacOSRomanStringEncodingName;
-extern NSString *XADMacOSJapaneseStringEncodingName;
-extern NSString *XADMacOSTraditionalChineseStringEncodingName;
-extern NSString *XADMacOSKoreanStringEncodingName;
-extern NSString *XADMacOSArabicStringEncodingName;
-extern NSString *XADMacOSHebrewStringEncodingName;
-extern NSString *XADMacOSGreekStringEncodingName;
-extern NSString *XADMacOSCyrillicStringEncodingName;
-extern NSString *XADMacOSSimplifiedChineseStringEncodingName;
-extern NSString *XADMacOSRomanianStringEncodingName;
-extern NSString *XADMacOSUkranianStringEncodingName;
-extern NSString *XADMacOSThaiStringEncodingName;
-extern NSString *XADMacOSCentralEuropeanRomanStringEncodingName;
-extern NSString *XADMacOSIcelandicStringEncodingName;
-extern NSString *XADMacOSTurkishStringEncodingName;
-extern NSString *XADMacOSCroatianStringEncodingName;
+extern NSString *const XADUTF8StringEncodingName;
+extern NSString *const XADASCIIStringEncodingName;
+
+extern NSString *const XADISOLatin1StringEncodingName;
+extern NSString *const XADISOLatin2StringEncodingName;
+extern NSString *const XADISOLatin3StringEncodingName;
+extern NSString *const XADISOLatin4StringEncodingName;
+extern NSString *const XADISOLatin5StringEncodingName;
+extern NSString *const XADISOLatin6StringEncodingName;
+extern NSString *const XADISOLatin7StringEncodingName;
+extern NSString *const XADISOLatin8StringEncodingName;
+extern NSString *const XADISOLatin9StringEncodingName;
+extern NSString *const XADISOLatin10StringEncodingName;
+extern NSString *const XADISOLatin11StringEncodingName;
+extern NSString *const XADISOLatin12StringEncodingName;
+extern NSString *const XADISOLatin13StringEncodingName;
+extern NSString *const XADISOLatin14StringEncodingName;
+extern NSString *const XADISOLatin15StringEncodingName;
+extern NSString *const XADISOLatin16StringEncodingName;
+
+extern NSString *const XADShiftJISStringEncodingName;
+
+extern NSString *const XADWindowsCP1250StringEncodingName;
+extern NSString *const XADWindowsCP1251StringEncodingName;
+extern NSString *const XADWindowsCP1252StringEncodingName;
+extern NSString *const XADWindowsCP1253StringEncodingName;
+extern NSString *const XADWindowsCP1254StringEncodingName;
+
+extern NSString *const XADMacOSRomanStringEncodingName;
+extern NSString *const XADMacOSJapaneseStringEncodingName;
+extern NSString *const XADMacOSTraditionalChineseStringEncodingName;
+extern NSString *const XADMacOSKoreanStringEncodingName;
+extern NSString *const XADMacOSArabicStringEncodingName;
+extern NSString *const XADMacOSHebrewStringEncodingName;
+extern NSString *const XADMacOSGreekStringEncodingName;
+extern NSString *const XADMacOSCyrillicStringEncodingName;
+extern NSString *const XADMacOSSimplifiedChineseStringEncodingName;
+extern NSString *const XADMacOSRomanianStringEncodingName;
+extern NSString *const XADMacOSUkranianStringEncodingName;
+extern NSString *const XADMacOSThaiStringEncodingName;
+extern NSString *const XADMacOSCentralEuropeanRomanStringEncodingName;
+extern NSString *const XADMacOSIcelandicStringEncodingName;
+extern NSString *const XADMacOSTurkishStringEncodingName;
+extern NSString *const XADMacOSCroatianStringEncodingName;
 
 
 @protocol XADString <NSObject>

XADString.m

@@ -24,50 +24,50 @@
 
 
 
-NSString *XADASCIIStringEncodingName=@"US-ASCII";
-NSString *XADUTF8StringEncodingName=@"UTF-8";
-
-NSString *XADISOLatin1StringEncodingName=@"iso-8859-1";
-NSString *XADISOLatin2StringEncodingName=@"iso-8859-2";
-NSString *XADISOLatin3StringEncodingName=@"iso-8859-3";
-NSString *XADISOLatin4StringEncodingName=@"iso-8859-4";
-NSString *XADISOLatin5StringEncodingName=@"iso-8859-5";
-NSString *XADISOLatin6StringEncodingName=@"iso-8859-6";
-NSString *XADISOLatin7StringEncodingName=@"iso-8859-7";
-NSString *XADISOLatin8StringEncodingName=@"iso-8859-8";
-NSString *XADISOLatin9StringEncodingName=@"iso-8859-9";
-NSString *XADISOLatin10StringEncodingName=@"iso-8859-10";
-NSString *XADISOLatin11StringEncodingName=@"iso-8859-11";
-NSString *XADISOLatin12StringEncodingName=@"iso-8859-12";
-NSString *XADISOLatin13StringEncodingName=@"iso-8859-13";
-NSString *XADISOLatin14StringEncodingName=@"iso-8859-14";
-NSString *XADISOLatin15StringEncodingName=@"iso-8859-15";
-NSString *XADISOLatin16StringEncodingName=@"iso-8859-16";
-
-NSString *XADShiftJISStringEncodingName=@"Shift_JIS";
-
-NSString *XADWindowsCP1250StringEncodingName=@"windows-1250";
-NSString *XADWindowsCP1251StringEncodingName=@"windows-1251";
-NSString *XADWindowsCP1252StringEncodingName=@"windows-1252";
-NSString *XADWindowsCP1253StringEncodingName=@"windows-1253";
-NSString *XADWindowsCP1254StringEncodingName=@"windows-1254";
-
-NSString *XADMacOSRomanStringEncodingName=@"macintosh";
-NSString *XADMacOSJapaneseStringEncodingName=@"x-mac-japanese";
-NSString *XADMacOSTraditionalChineseStringEncodingName=@"x-mac-trad-chinese";
-NSString *XADMacOSKoreanStringEncodingName=@"x-mac-korean";
-NSString *XADMacOSArabicStringEncodingName=@"x-mac-arabic";
-NSString *XADMacOSHebrewStringEncodingName=@"x-mac-hebrew";
-NSString *XADMacOSGreekStringEncodingName=@"x-mac-greek";
-NSString *XADMacOSCyrillicStringEncodingName=@"x-mac-cyrillic";
-NSString *XADMacOSSimplifiedChineseStringEncodingName=@"x-mac-simp-chinese";
-NSString *XADMacOSRomanianStringEncodingName=@"x-mac-romanian";
-NSString *XADMacOSUkranianStringEncodingName=@"x-mac-ukrainian";
-NSString *XADMacOSThaiStringEncodingName=@"x-mac-thai";
-NSString *XADMacOSCentralEuropeanRomanStringEncodingName=@"x-mac-centraleurroman";
-NSString *XADMacOSIcelandicStringEncodingName=@"x-mac-icelandic";
-NSString *XADMacOSTurkishStringEncodingName=@"x-mac-turkish";
-NSString *XADMacOSCroatianStringEncodingName=@"x-mac-croatian";
+NSString *const XADASCIIStringEncodingName=@"US-ASCII";
+NSString *const XADUTF8StringEncodingName=@"UTF-8";
+
+NSString *const XADISOLatin1StringEncodingName=@"iso-8859-1";
+NSString *const XADISOLatin2StringEncodingName=@"iso-8859-2";
+NSString *const XADISOLatin3StringEncodingName=@"iso-8859-3";
+NSString *const XADISOLatin4StringEncodingName=@"iso-8859-4";
+NSString *const XADISOLatin5StringEncodingName=@"iso-8859-5";
+NSString *const XADISOLatin6StringEncodingName=@"iso-8859-6";
+NSString *const XADISOLatin7StringEncodingName=@"iso-8859-7";
+NSString *const XADISOLatin8StringEncodingName=@"iso-8859-8";
+NSString *const XADISOLatin9StringEncodingName=@"iso-8859-9";
+NSString *const XADISOLatin10StringEncodingName=@"iso-8859-10";
+NSString *const XADISOLatin11StringEncodingName=@"iso-8859-11";
+NSString *const XADISOLatin12StringEncodingName=@"iso-8859-12";
+NSString *const XADISOLatin13StringEncodingName=@"iso-8859-13";
+NSString *const XADISOLatin14StringEncodingName=@"iso-8859-14";
+NSString *const XADISOLatin15StringEncodingName=@"iso-8859-15";
+NSString *const XADISOLatin16StringEncodingName=@"iso-8859-16";
+
+NSString *const XADShiftJISStringEncodingName=@"Shift_JIS";
+
+NSString *const XADWindowsCP1250StringEncodingName=@"windows-1250";
+NSString *const XADWindowsCP1251StringEncodingName=@"windows-1251";
+NSString *const XADWindowsCP1252StringEncodingName=@"windows-1252";
+NSString *const XADWindowsCP1253StringEncodingName=@"windows-1253";
+NSString *const XADWindowsCP1254StringEncodingName=@"windows-1254";
+
+NSString *const XADMacOSRomanStringEncodingName=@"macintosh";
+NSString *const XADMacOSJapaneseStringEncodingName=@"x-mac-japanese";
+NSString *const XADMacOSTraditionalChineseStringEncodingName=@"x-mac-trad-chinese";
+NSString *const XADMacOSKoreanStringEncodingName=@"x-mac-korean";
+NSString *const XADMacOSArabicStringEncodingName=@"x-mac-arabic";
+NSString *const XADMacOSHebrewStringEncodingName=@"x-mac-hebrew";
+NSString *const XADMacOSGreekStringEncodingName=@"x-mac-greek";
+NSString *const XADMacOSCyrillicStringEncodingName=@"x-mac-cyrillic";
+NSString *const XADMacOSSimplifiedChineseStringEncodingName=@"x-mac-simp-chinese";
+NSString *const XADMacOSRomanianStringEncodingName=@"x-mac-romanian";
+NSString *const XADMacOSUkranianStringEncodingName=@"x-mac-ukrainian";
+NSString *const XADMacOSThaiStringEncodingName=@"x-mac-thai";
+NSString *const XADMacOSCentralEuropeanRomanStringEncodingName=@"x-mac-centraleurroman";
+NSString *const XADMacOSIcelandicStringEncodingName=@"x-mac-icelandic";
+NSString *const XADMacOSTurkishStringEncodingName=@"x-mac-turkish";
+NSString *const XADMacOSCroatianStringEncodingName=@"x-mac-croatian";
 
 static BOOL IsDataASCII(NSData *data);
 

XADXARParser.m

@@ -37,12 +37,12 @@
 #define ExtendedAttributeState 5
 #define OldExtendedAttributeState 6
 
-static const NSString *StringFormat=@"String";
-static const NSString *XADStringFormat=@"XADString";
-static const NSString *DecimalFormat=@"Decimal";
-static const NSString *OctalFormat=@"Octal";
-static const NSString *HexFormat=@"Hex";
-static const NSString *DateFormat=@"Date";
+static const NSString *const StringFormat=@"String";
+static const NSString *const XADStringFormat=@"XADString";
+static const NSString *const DecimalFormat=@"Decimal";
+static const NSString *const OctalFormat=@"Octal";
+static const NSString *const HexFormat=@"Hex";
+static const NSString *const DateFormat=@"Date";
 
 @implementation XADXARParser