[patch] fixes strings in functions for locating config file

tomatoes-1.55-config_strings.patch (text/plain), 1.74 KB, created by whereami on 2006-04-13 02:02:40 UTC

diff -ru tomatoes-1.55-orig/include/config.h tomatoes-1.55/include/config.h
--- tomatoes-1.55-orig/include/config.h	2006-04-13 01:16:04.000000000 -0700
+++ tomatoes-1.55/include/config.h	2006-04-13 01:18:35.000000000 -0700
@@ -59,14 +59,14 @@
 // config file. It first checks the user's home directory,
 // and if that fails it uses the CONFIG_DIR defined in the
 // makefile.
-char *get_config_location(bool write = false);
+string get_config_location(bool write = false);
 
 
 // Load config from file
-void load_config(char *file, CONFIG *conf);
+void load_config(string file, CONFIG *conf);
 
 // Save config to file
-void save_config(char *file, CONFIG *conf);
+void save_config(string file, CONFIG *conf);
 
 #endif
 
diff -ru tomatoes-1.55-orig/src/config.cpp tomatoes-1.55/src/config.cpp
--- tomatoes-1.55-orig/src/config.cpp	2006-04-13 01:16:04.000000000 -0700
+++ tomatoes-1.55/src/config.cpp	2006-04-13 01:18:39.000000000 -0700
@@ -76,7 +76,7 @@
 // config file. It first checks the user's home directory,
 // and if that fails it uses the CONFIG_DIR defined in the
 // makefile.
-char *get_config_location(bool write) {
+string get_config_location(bool write) {
 #ifdef LINUX
 	// Get the path to the config file
 	string tmp = get_tomatoes_dir() + "config.cfg";
@@ -91,7 +91,7 @@
 		fclose(ftest);
 	}
 
-	return (char*)tmp.c_str();
+	return tmp;
 #endif
 
 	// Return the CONFIG_DIR
@@ -100,7 +100,7 @@
 
 
 // Load config from file
-void load_config(char *file, CONFIG *conf) {
+void load_config(string file, CONFIG *conf) {
 
 	FILE *f = fopen(file, "rt");
 	if(!f)
@@ -127,7 +127,7 @@
 
 
 // Save config to file
-void save_config(char *file, CONFIG *conf) {
+void save_config(string file, CONFIG *conf) {
 
 	FILE *f = fopen(file, "wt");
 	if(!f)