From daf2bc9579a7405079b818213434efc6ab9bb1c1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 21 Jan 2008 13:01:32 +0000
Subject: replaced the unsafe tag2str implementation by a safe one, now that it
 seems to be meant for general use ;)

svn-id: r30599
---
 common/util.cpp | 6 +++---
 common/util.h   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/util.cpp b/common/util.cpp
index 8068378d5b..6b2e16ee88 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -640,12 +640,12 @@ char *scumm_strrev(char *str) {
 	return str;
 }
 
-const char *tag2str(uint32 tag) {
-	static char str[5];
+Common::String tag2string(uint32 tag) {
+	char str[5];
 	str[0] = (char)(tag >> 24);
 	str[1] = (char)(tag >> 16);
 	str[2] = (char)(tag >> 8);
 	str[3] = (char)tag;
 	str[4] = '\0';
-	return str;
+	return Common::String(str);
 }
diff --git a/common/util.h b/common/util.h
index f4f40223b1..e7abd19544 100644
--- a/common/util.h
+++ b/common/util.h
@@ -319,7 +319,8 @@ extern int gDebugLevel;
 
 char *scumm_strrev(char *str);
 
-const char *tag2str(uint32 tag);
+Common::String tag2string(uint32 tag);
+#define tag2str(x)	tag2string(x).c_str()
 
 
 #endif
-- 
cgit v1.2.3