From 6a9b0b5589f497b93967cae05a8a8da46993e07b Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 6 Mar 2010 03:55:27 +0000
Subject: [PATCH]  * Return an std::string  * Be const correct.  * Use c_str()
 to ensure null termination.  * Remove stray , from default_mru.json.

Originally committed to SVN as r4171.
---
 aegisub/src/libresrc/default_mru.json | 2 +-
 aegisub/src/libresrc/libresrc.cpp     | 6 +++---
 aegisub/src/libresrc/libresrc.h       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aegisub/src/libresrc/default_mru.json b/aegisub/src/libresrc/default_mru.json
index 4a4e3f42b..10bb3e2e2 100644
--- a/aegisub/src/libresrc/default_mru.json
+++ b/aegisub/src/libresrc/default_mru.json
@@ -1,5 +1,5 @@
 {
 	"Audio" : [],
 	"Video" : [],
-	"Scripts" : [],
+	"Scripts" : []
 }
diff --git a/aegisub/src/libresrc/libresrc.cpp b/aegisub/src/libresrc/libresrc.cpp
index 3e9423f60..f90fecf6d 100644
--- a/aegisub/src/libresrc/libresrc.cpp
+++ b/aegisub/src/libresrc/libresrc.cpp
@@ -6,7 +6,7 @@ wxBitmap libresrc_getimage(const unsigned char *buff, size_t size) {
 	return wxBitmap(image);
 }
 
-const std::string libresrc_getconfig(const char *config, size_t size) {
-	std::string str(config, size);
-	return str;
+const std::string libresrc_getconfig(const unsigned char *config, size_t size) {
+        std::string str((char*)config, size);
+        return str.c_str();
 }
diff --git a/aegisub/src/libresrc/libresrc.h b/aegisub/src/libresrc/libresrc.h
index 31722668a..e177cc727 100644
--- a/aegisub/src/libresrc/libresrc.h
+++ b/aegisub/src/libresrc/libresrc.h
@@ -1,14 +1,14 @@
+#include <string>
+
 #include <wx/mstream.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
 
-#include <sstream>
-
 #include "bitmap.h"
 #include "default_config.h"
 
 wxBitmap libresrc_getimage(const unsigned char *image, size_t size);
 #define GETIMAGE(a) libresrc_getimage(a, sizeof(a))
 
-const std::string libresrc_getconfig(const char *config, size_t size);
-#define CET_DEFAULT_CONFIG(a) libresrc_getconfig(a, sizeof(a))
+const std::string libresrc_getconfig(const unsigned char *config, size_t size);
+#define GET_DEFAULT_CONFIG(a) libresrc_getconfig(a, sizeof(a))