1 files changed, 56 insertions, 56 deletions

diff --git a/src/StringUtil.cc b/src/StringUtil.cc
index 81c1c23..221d68d 100644
--- a/src/StringUtil.cc
+++ b/src/StringUtil.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StringUtil.cc,v 1.13 2002/10/15 09:51:56 fluxgen Exp $
+// $Id: StringUtil.cc,v 1.14 2002/12/01 13:41:59 rathnor Exp $
 
 #include "StringUtil.hh"
 
@@ -41,10 +41,10 @@ namespace StringUtil
 // returns a pointer to n.
 //----------------------------------------
 char *strdup(const char *s) {
-  int l = strlen(s) + 1;
-  char *n = new char[l];
-  strncpy(n, s, l);
-  return n;
+    int l = strlen(s) + 1;
+    char *n = new char[l];
+    strncpy(n, s, l);
+    return n;
 }
 
 //------- strcasestr --------------
@@ -53,14 +53,14 @@ char *strdup(const char *s) {
 // Returns 0 on success else pointer to str.
 //---------------------------------
 const char *strcasestr(const char *str, const char *ptn) {
-        const char *s2, *p2;
-        for( ; *str; str++) {
-                for(s2=str, p2=ptn; ; s2++,p2++) {      
-                        if (!*p2) return str; // check if we reached the end of ptn, if so, return str
-                        if (toupper(*s2) != toupper(*p2)) break; // check if the chars match(ignoring case)
-                }
-        }
-        return 0;
+    const char *s2, *p2;
+    for( ; *str; str++) {
+        for(s2=str, p2=ptn; ; s2++,p2++) {      
+            if (!*p2) return str; // check if we reached the end of ptn, if so, return str
+            if (toupper(*s2) != toupper(*p2)) break; // check if the chars match(ignoring case)
+        }
+    }
+    return 0;
 }
 
 //------------- expandFilename ----------------------
@@ -69,18 +69,18 @@ const char *strcasestr(const char *str, const char *ptn) {
 //---------------------------------------------------
 string expandFilename(const std::string &filename) {
   
-        string retval;
-        size_t pos = filename.find_first_not_of(" \t");
-        if (pos != std::string::npos && filename[pos] == '~') {         
+    string retval;
+    size_t pos = filename.find_first_not_of(" \t");
+    if (pos != std::string::npos && filename[pos] == '~') {     
         retval = getenv("HOME");
-                if (pos != filename.size()) {
-                        // copy from the character after '~'
-                        retval += static_cast<const char *>(filename.c_str() + pos + 1);
-                }
-        } else
-                return filename; //return unmodified value
+        if (pos != filename.size()) {
+            // copy from the character after '~'
+            retval += static_cast<const char *>(filename.c_str() + pos + 1);
+        }
+    } else
+        return filename; //return unmodified value
   
-        return retval;
+    return retval;
 }
 
 //------------- getStringBetween -----------
@@ -94,48 +94,48 @@ string expandFilename(const std::string &filename) {
 // was found.
 //------------------------------------------
 int getStringBetween(std::string& out, const char *instr, const char first, const char last,
-                        const char *ok_chars) {
-        assert(first);
-        assert(last);
-        assert(instr);
+                     const char *ok_chars) {
+    assert(first);
+    assert(last);
+    assert(instr);
         
-        std::string::size_type i = 0, 
-                total_add=0; //used to add extra if there is a \last to skip
-        std::string in(instr);
+    std::string::size_type i = 0, 
+        total_add=0; //used to add extra if there is a \last to skip
+    std::string in(instr);
         
-        // eat leading whitespace
-        i = in.find_first_not_of(ok_chars);
-        if (i == std::string::npos)
-                return -in.size();   // nothing left but whitespace
+    // eat leading whitespace
+    i = in.find_first_not_of(ok_chars);
+    if (i == std::string::npos)
+        return -in.size();   // nothing left but whitespace
 
-        if (in[i]!=first)               
-                return -i; //return position to error   
+    if (in[i]!=first)           
+        return -i; //return position to error   
 
-        // find the end of the token
-        std::string::size_type j = i;
-        while (1) {
-                j = in.find_first_of(last, j+1);
-                if (j==std::string::npos)
-                        return -in.size(); //send negative size
+    // find the end of the token
+    std::string::size_type j = i;
+    while (1) {
+        j = in.find_first_of(last, j+1);
+        if (j==std::string::npos)
+            return -in.size(); //send negative size
 
-                //we found the last char, check so it doesn't have a '\' before
-                if (j>1 && in[j-1] != '\\')     
-                        break;
-                else if (j>1) {
-                        in.erase(j-1, 1); //remove the '\'
-                        j--;
-                        total_add++; //save numchars removed so we can calculate totalpos
-                }
-        }
+        //we found the last char, check so it doesn't have a '\' before
+        if (j>1 && in[j-1] != '\\')     
+            break;
+        else if (j>1) {
+            in.erase(j-1, 1); //remove the '\'
+            j--;
+            total_add++; //save numchars removed so we can calculate totalpos
+        }
+    }
 
-        out = in.substr(i+1, j-i-1); //copy the string between first and last           
-        //return value to last character
-        return (j+1+total_add);
+    out = in.substr(i+1, j-i-1); //copy the string between first and last               
+    //return value to last character
+    return (j+1+total_add);
 }
 
 void toLower(char * const conv) {
-        for (size_t byte_pos = 0; byte_pos < strlen(conv); ++byte_pos)
-                conv[byte_pos] = tolower(conv[byte_pos]);
+    for (size_t byte_pos = 0; byte_pos < strlen(conv); ++byte_pos)
+        conv[byte_pos] = tolower(conv[byte_pos]);
 }
 
 }; //end namespace StringUtil