* Fix \x parsing in collectcatkeys again (thanks to Kaliber)

* Hide the CatalogStub::GetCatalog method so that if liblocalestub.a is missing from a localized image, it will not try to steal the catalog of another one.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37602 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/locale/Catalog.h

@@ -57,7 +57,8 @@ class BCatalog {
 // This must be included (statically linked) into each shared object needing
 // a catalog on its own (application, add-on, library, ...). The shared object
 // must also have a mimetype so that the catalog can be identified.
-class BCatalogStub {
+class BCatalogStub 
+{
 	private:
 		static BCatalog	sCatalog;
 		static vint32	sCatalogInitOnce;

src/kits/locale/CatalogStub.cpp

@@ -19,10 +19,15 @@ vint32 BCatalogStub::sCatalogInitOnce = false;
 /* static */ BCatalog*
 BCatalogStub::GetCatalog()
 {
+	#if (__GNUC__ < 3)
+		asm volatile(".hidden GetCatalog__12BCatalogStub");
+	#else
+		asm volatile(".hidden _ZN12BCatalogStub10GetCatalogEv");
+	#endif
+
 	return be_locale_roster->GetCatalog(&sCatalog, &sCatalogInitOnce);
 }
 
-
 /* static */ void
 BCatalogStub::ForceReload()
 {

src/kits/locale/HashMapCatalog.cpp

@@ -164,7 +164,7 @@ parseQuotedChars(BString& stringToParse)
 				char tmp[3];
 				tmp[0] = *(in+1);
 				tmp[1] = *(in+2);
-				tmp[3] = '\0';
+				tmp[2] = '\0';
 				unsigned int hexchar = strtoul(tmp, NULL, 16);
 				*out = hexchar;
 				// skip the number

src/tools/locale/HashMapCatalog.cpp

@@ -168,7 +168,7 @@ parseQuotedChars(BString& stringToParse)
 				char tmp[3];
 				tmp[0] = *(in+1);
 				tmp[1] = *(in+2);
-				tmp[3] = '\0';
+				tmp[2] = '\0';
 				unsigned int hexchar = strtoul(tmp, NULL, 16);
 				*out = hexchar;
 				// skip the number