mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increment GitVersion. Renaming

Browse source
This commit is contained in:
Alex Barney 2019-10-14 17:26:47 -05:00
parent 102adb4a11
commit 9b9e83f1dc
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GitVersion.yml
View file

@ -1,6 +1,6 @@
mode: ContinuousDeployment mode: ContinuousDeployment
increment: Patch increment: Patch
next-version: 0.6.0 next-version: 0.7.0
branches: branches:
master: master:
tag: alpha tag: alpha

2
src/LibHac/Common/PathBuilder.cs
View file

@ -83,7 +83,7 @@ namespace LibHac.Common
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public Result RewindLevels(int count) public Result GoUpLevels(int count)
{ {
Debug.Assert(count > 0); Debug.Assert(count > 0);

20
src/LibHac/FsSystem/PathTools.cs
View file

@ -540,20 +540,20 @@ namespace LibHac.FsSystem
return Result.Success; 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; int rootLength = 0;
ReadOnlySpan<byte> mainPath = path; ReadOnlySpan<byte> mainPath = path;
if (hasMountName) 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; if (pathRootRc.IsFailure()) return pathRootRc;
} }
var sb = new PathBuilder(outValue.Slice(rootLength)); var sb = new PathBuilder(normalizedPath.Slice(rootLength));
var state = NormalizeState.Initial; var state = NormalizeState.Initial;
@ -597,7 +597,7 @@ namespace LibHac.FsSystem
case NormalizeState.Dot when IsDirectorySeparator(c): case NormalizeState.Dot when IsDirectorySeparator(c):
state = NormalizeState.Delimiter; state = NormalizeState.Delimiter;
rc = sb.RewindLevels(1); rc = sb.GoUpLevels(1);
break; break;
case NormalizeState.Dot when c == '.': case NormalizeState.Dot when c == '.':
@ -612,7 +612,7 @@ namespace LibHac.FsSystem
case NormalizeState.DoubleDot when IsDirectorySeparator(c): case NormalizeState.DoubleDot when IsDirectorySeparator(c):
state = NormalizeState.Delimiter; state = NormalizeState.Delimiter;
rc = sb.RewindLevels(2); rc = sb.GoUpLevels(2);
break; break;
case NormalizeState.DoubleDot: case NormalizeState.DoubleDot:
@ -631,7 +631,7 @@ namespace LibHac.FsSystem
} }
} }
outLength = sb.Length; normalizedLength = sb.Length;
sb.Terminate(); sb.Terminate();
return rc; return rc;
} }
@ -643,12 +643,12 @@ namespace LibHac.FsSystem
{ {
case NormalizeState.Dot: case NormalizeState.Dot:
state = NormalizeState.Delimiter; state = NormalizeState.Delimiter;
finalRc = sb.RewindLevels(1); finalRc = sb.GoUpLevels(1);
break; break;
case NormalizeState.DoubleDot: case NormalizeState.DoubleDot:
state = NormalizeState.Delimiter; state = NormalizeState.Delimiter;
finalRc = sb.RewindLevels(2); finalRc = sb.GoUpLevels(2);
break; break;
} }
@ -660,7 +660,7 @@ namespace LibHac.FsSystem
finalRc = sb.Append((byte)'/'); finalRc = sb.Append((byte)'/');
} }
outLength = sb.Length; normalizedLength = sb.Length;
sb.Terminate(); sb.Terminate();
return finalRc; return finalRc;