Changeset 1064 for library/bdm/osutils.cpp

Timestamp:

06/09/10 14:00:40 (14 years ago)

Author:

mido

Message:

astyle applied all over the library

Files:

• library/bdm/osutils.cpp (modified) (2 diffs)

library/bdm/osutils.cpp

@@ -35 +35 @@
 void get_fname ( char* filename, string &dirname, string &f ) {
 #ifdef WIN32
-        sprintf ( filename, "%s\\%s", dirname.c_str(), f.c_str() );
+    sprintf ( filename, "%s\\%s", dirname.c_str(), f.c_str() );
 #else
-        sprintf ( filename, "%s/%s", dirname.c_str() , f.c_str() );
+    sprintf ( filename, "%s/%s", dirname.c_str() , f.c_str() );
 #endif
 }
@@ -43 +43 @@
 void makedir ( string &dirname, bool rewrite ) {
 #ifdef WIN32
-        if ( _mkdir ( dirname.c_str() ) == -1 )   // Create the directory
+    if ( _mkdir ( dirname.c_str() ) == -1 )   // Create the directory
 #else
-        if ( mkdir ( dirname.c_str(), 00755 ) == -1 )   // Create the directory
+    if ( mkdir ( dirname.c_str(), 00755 ) == -1 )   // Create the directory
 #endif
-        {
-                if ( ( rewrite ) && ( errno == EEXIST ) ) bdm_warning ( "rewriting directory" );
-                else bdm_error ( "dirfilelog:: cannot create directory" );
-        }
+    {
+        if ( ( rewrite ) && ( errno == EEXIST ) ) bdm_warning ( "rewriting directory" );
+        else bdm_error ( "dirfilelog:: cannot create directory" );
+    }
 }
 
 bool remove_all ( const char *path ) {
-        DIR *dir;
-        dirent *de;
+    DIR *dir;
+    dirent *de;
 
-        bool rv = true;
-        if ( ( dir = opendir ( path ) ) != 0 ) {
-                try {
-                        std::string top ( path );
-                        top += "/";
+    bool rv = true;
+    if ( ( dir = opendir ( path ) ) != 0 ) {
+        try {
+            std::string top ( path );
+            top += "/";
 
-                        while ( ( de = readdir ( dir ) ) != 0 ) {
-                                if ( strcmp ( de->d_name, "." ) && strcmp ( de->d_name, ".." ) ) {
-                                        std::string subpath ( top );
-                                        subpath += de->d_name;
-                                        remove_all ( subpath.c_str() );
-                                }
-                        }
-                } catch ( ... ) {
-                        closedir ( dir );
-                        throw;
-                }
+            while ( ( de = readdir ( dir ) ) != 0 ) {
+                if ( strcmp ( de->d_name, "." ) && strcmp ( de->d_name, ".." ) ) {
+                    std::string subpath ( top );
+                    subpath += de->d_name;
+                    remove_all ( subpath.c_str() );
+                }
+            }
+        } catch ( ... ) {
+            closedir ( dir );
+            throw;
+        }
 
-                closedir ( dir );
+        closedir ( dir );
 
-                if ( rmdir ( path ) ) {
-                        std::string msg = "can't remove dir ";
-                        msg += path;
-                        bdm_error ( msg );
-                }
-        } else {
-                if ( ( errno == ENOTDIR ) || // Linux
-                        ( errno == EINVAL ) ) { // Windows
-                        if ( unlink ( path ) ) {
-                                std::string msg = "can't remove file ";
-                                msg += path;
-                                bdm_error ( msg );
-                        }
-                } else {
-                        if ( errno != ENOENT ) {
-                                std::string msg = "can't remove ";
-                                msg += path;
-                                bdm_error ( msg );
-                        } else {
-                                // it wasn't there in the first place
-                                rv = false;
-                        }
-                }
-        }
+        if ( rmdir ( path ) ) {
+            std::string msg = "can't remove dir ";
+            msg += path;
+            bdm_error ( msg );
+        }
+    } else {
+        if ( ( errno == ENOTDIR ) || // Linux
+                ( errno == EINVAL ) ) { // Windows
+            if ( unlink ( path ) ) {
+                std::string msg = "can't remove file ";
+                msg += path;
+                bdm_error ( msg );
+            }
+        } else {
+            if ( errno != ENOENT ) {
+                std::string msg = "can't remove ";
+                msg += path;
+                bdm_error ( msg );
+            } else {
+                // it wasn't there in the first place
+                rv = false;
+            }
+        }
+    }
 
-        return rv;
+    return rv;
 }