--- parser3/src/main/pa_string.C	2012/06/20 21:01:20	1.243
+++ parser3/src/main/pa_string.C	2015/04/06 22:27:26	1.246
@@ -12,7 +12,7 @@
 #include "pa_charset.h"
 #include "pa_vregex.h"
 
-volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.243 2012/06/20 21:01:20 moko Exp $" IDENT_PA_STRING_H;
+volatile const char * IDENT_PA_STRING_C="$Id: pa_string.C,v 1.246 2015/04/06 22:27:26 moko Exp $" IDENT_PA_STRING_H;
 
 const String String::Empty;
 
@@ -37,9 +37,10 @@ unsigned int pa_atoui(const char *str, i
 		base = 10; /* default is 10 */
 		if (*pos == '0') {
 			++pos;
-			if (*pos == 'x' || *pos == 'X')
+			if (*pos == 'x' || *pos == 'X'){
 				++pos;
 				base=16;
+			}
 		}
 	}
 
@@ -436,7 +437,7 @@ String& String::append_help_length(const
 
 	return append_know_length(str, known_length, lang);
 }
-String::String(int value, char *format) : langs(L_CLEAN){
+String::String(int value, const char *format) : langs(L_CLEAN){
 	char buf[MAX_NUMBER];
 	body.append_strdup_know_length(buf, snprintf(buf, MAX_NUMBER, format, value));
 }
@@ -959,7 +960,7 @@ void String::Languages::dump() const {
 }
 const char* String::v() const {
 	const uint LIMIT_VIEW=20;
-	char* buf=(char*)malloc(MAX_STRING);
+	char* buf=(char*)pa_malloc(MAX_STRING);
 	const char*body_view=body.v();
 	const char*langs_view=langs.v();
 	snprintf(buf, MAX_STRING,