[Gnash-commit] gnash ChangeLog libbase/rc.cpp libbase/rc.h

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/10/03 17:55:13

Modified files:
        .              : ChangeLog 
        libbase        : rc.cpp rc.h 

Log message:
        make expandPath void and other small cleanups

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4513&r2=1.4514
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4513
retrieving revision 1.4514
diff -u -b -r1.4513 -r1.4514
--- ChangeLog   3 Oct 2007 17:27:23 -0000       1.4513
+++ ChangeLog   3 Oct 2007 17:55:13 -0000       1.4514
@@ -1,3 +1,7 @@
+2007-10-04 Benjamin Wolsey <address@hidden>
+
+       * libbase/rc.{cpp,h}: make expandPath void and other small cleanups.
+
 2007-10-04 Chad Musick <address@hidden>
 
        * server/vm/AbcHandlers.cpp: New file. This will become the

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- libbase/rc.cpp      3 Oct 2007 14:15:23 -0000       1.40
+++ libbase/rc.cpp      3 Oct 2007 17:55:13 -0000       1.41
@@ -236,14 +236,13 @@
     }
 }
 
-string
+void
 RcInitFile::expandPath (std::string& path)
 
 {
 
-//Returns what's passed to it on systems without
-//POSIX tilde expansion, but is still called to prepare
-//for other operations on the path string
+// Leaves path unchanged on systems without
+// POSIX tilde expansion.
 
 #ifdef HAVE_PWD_H
 //Don't build tilde expansion on systems without pwd.h
@@ -299,7 +298,6 @@
                  }
 #endif
 
-     return path;
 }
 
 // Parse the config file and set the variables.
@@ -364,7 +362,8 @@
                 }
 
                 if (variable == "debuglog") {
-                    _log = expandPath (value);
+                    expandPath (value);
+                   _log = value;
                     continue;
                 }
 

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libbase/rc.h        3 Oct 2007 14:15:23 -0000       1.29
+++ libbase/rc.h        3 Oct 2007 17:55:13 -0000       1.30
@@ -163,7 +163,7 @@
     /// The number of seconds of inactivity triggering download timeout
     double _streamsTimeout;
 
-    static std::string expandPath(std::string& path); //path string operations
+    void expandPath(std::string& path); //path string operations
 
     static bool extractSetting(bool *var, const char *pattern,
                         std::string &variable, std::string &value);
@@ -174,7 +174,7 @@
     static void extractDouble(double& out, const char *pattern,
                         std::string &variable, std::string &value);
 
-    static void parseList(std::vector<std::string>& list, std::string &action,
+    void parseList(std::vector<std::string>& list, std::string &action,
                        std::string &listname, std::string &items);
 
 };