mirror of
https://github.com/Thealexbarney/LibHac.git
synced 2024-11-14 10:49:41 +01:00
Increment GitVersion. Renaming
This commit is contained in:
parent
102adb4a11
commit
9b9e83f1dc
3 changed files with 12 additions and 12 deletions
|
@ -1,6 +1,6 @@
|
|||
mode: ContinuousDeployment
|
||||
increment: Patch
|
||||
next-version: 0.6.0
|
||||
next-version: 0.7.0
|
||||
branches:
|
||||
master:
|
||||
tag: alpha
|
|
@ -83,7 +83,7 @@ namespace LibHac.Common
|
|||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public Result RewindLevels(int count)
|
||||
public Result GoUpLevels(int count)
|
||||
{
|
||||
Debug.Assert(count > 0);
|
||||
|
||||
|
|
|
@ -540,20 +540,20 @@ namespace LibHac.FsSystem
|
|||
return Result.Success;
|
||||
}
|
||||
|
||||
public static Result Normalize(Span<byte> outValue, out int outLength, ReadOnlySpan<byte> path, bool hasMountName)
|
||||
public static Result Normalize(Span<byte> normalizedPath, out int normalizedLength, ReadOnlySpan<byte> path, bool hasMountName)
|
||||
{
|
||||
outLength = 0;
|
||||
normalizedLength = 0;
|
||||
|
||||
int rootLength = 0;
|
||||
ReadOnlySpan<byte> 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;
|
||||
|
|
Loading…
Reference in a new issue