diff --git a/GitVersion.yml b/GitVersion.yml index 69f17540..34814080 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,6 +1,6 @@ mode: ContinuousDeployment increment: Patch -next-version: 0.6.0 +next-version: 0.7.0 branches: master: tag: alpha \ No newline at end of file diff --git a/src/LibHac/Common/PathBuilder.cs b/src/LibHac/Common/PathBuilder.cs index 39041711..afdd78e7 100644 --- a/src/LibHac/Common/PathBuilder.cs +++ b/src/LibHac/Common/PathBuilder.cs @@ -83,7 +83,7 @@ namespace LibHac.Common } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Result RewindLevels(int count) + public Result GoUpLevels(int count) { Debug.Assert(count > 0); diff --git a/src/LibHac/FsSystem/PathTools.cs b/src/LibHac/FsSystem/PathTools.cs index f7e641a9..8d7ee926 100644 --- a/src/LibHac/FsSystem/PathTools.cs +++ b/src/LibHac/FsSystem/PathTools.cs @@ -540,20 +540,20 @@ namespace LibHac.FsSystem return Result.Success; } - public static Result Normalize(Span outValue, out int outLength, ReadOnlySpan path, bool hasMountName) + public static Result Normalize(Span normalizedPath, out int normalizedLength, ReadOnlySpan path, bool hasMountName) { - outLength = 0; + normalizedLength = 0; int rootLength = 0; ReadOnlySpan mainPath = path; if (hasMountName) { - Result pathRootRc = GetPathRoot(out mainPath, outValue, out rootLength, path); + Result pathRootRc = GetPathRoot(out mainPath, normalizedPath, out rootLength, path); if (pathRootRc.IsFailure()) return pathRootRc; } - var sb = new PathBuilder(outValue.Slice(rootLength)); + var sb = new PathBuilder(normalizedPath.Slice(rootLength)); var state = NormalizeState.Initial; @@ -597,7 +597,7 @@ namespace LibHac.FsSystem case NormalizeState.Dot when IsDirectorySeparator(c): state = NormalizeState.Delimiter; - rc = sb.RewindLevels(1); + rc = sb.GoUpLevels(1); break; case NormalizeState.Dot when c == '.': @@ -612,7 +612,7 @@ namespace LibHac.FsSystem case NormalizeState.DoubleDot when IsDirectorySeparator(c): state = NormalizeState.Delimiter; - rc = sb.RewindLevels(2); + rc = sb.GoUpLevels(2); break; case NormalizeState.DoubleDot: @@ -631,7 +631,7 @@ namespace LibHac.FsSystem } } - outLength = sb.Length; + normalizedLength = sb.Length; sb.Terminate(); return rc; } @@ -643,12 +643,12 @@ namespace LibHac.FsSystem { case NormalizeState.Dot: state = NormalizeState.Delimiter; - finalRc = sb.RewindLevels(1); + finalRc = sb.GoUpLevels(1); break; case NormalizeState.DoubleDot: state = NormalizeState.Delimiter; - finalRc = sb.RewindLevels(2); + finalRc = sb.GoUpLevels(2); break; } @@ -660,7 +660,7 @@ namespace LibHac.FsSystem finalRc = sb.Append((byte)'/'); } - outLength = sb.Length; + normalizedLength = sb.Length; sb.Terminate(); return finalRc;