X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Ffuse%2Fclass_FrameworkFuseWrapper.php_discontinued;h=6736a78c6208de55b06763166ecf8c07889c47a7;hb=08a0c865dd2c8ee0b6dbf96f4f07e9ee0ce0f02b;hp=14a4c47af4326a90f987c5a073d178d814677c88;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
index 14a4c47a..6736a78c 100644
--- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
+++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\CoreFramework\Wrapper\Fuse;
+namespace Org\Mxchange\CoreFramework\Frontend\Fuse;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Registry\Registerable;
@@ -17,11 +17,7 @@ use \FuseWrapper;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/fuse/class_FrameworkFuseWrapper.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -72,7 +68,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 	public function FsOpen ($path, FuseFileInfo $fi) {
 		if (($fi->flags & FUSE_O_ACCMODE) != FUSE_O_RDONLY) {
 			return -FUSE_ENOACCES;
-		} // END - if
+		}
 
 		return -FUSE_ENOERR;
 	}
@@ -92,7 +88,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 
 		if ($offset > strlen($data)) {
 			return 0;
-		} // END - if
+		}
 
 		$buf = substr( $data, $offset, $size );
 
@@ -109,7 +105,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 	public function FsReadDir ($path, array &$buf) {
 		if (strcmp($path, '/') != 0) {
 			return -FUSE_ENOENT;
-		} // END - if
+		}
 
 		$buf[] = '.';
 		$buf[] = '..';