Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Span support to Webencoders with direct encoding #338

Closed
wants to merge 8 commits into from
Closed

Added Span support to Webencoders with direct encoding #338

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
637d4f9
Commits from https://github.com/aspnet/Common/pull/334
gfoidl Mar 18, 2018
355fc8b
UrlEncoder<T>.Encode and Decode added
gfoidl Apr 10, 2018
0fbee68
Encode and Decode uses UrlEncoder
gfoidl Apr 12, 2018
5b4d531
UrlCharHelper removed, is not needed anymore
gfoidl Apr 16, 2018
a08b7a5
Cleanup
gfoidl Apr 16, 2018
902e507
Code style
gfoidl Apr 16, 2018
db2297b
Included .NET Core 2.2 in multi-targeting
gfoidl Jun 19, 2018
aa41266
Rearranged the #if to make it more readable
gfoidl Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Rearranged the #if to make it more readable 
Cf. #338 (comment)
  • Loading branch information
@gfoidl
gfoidl committed Jun 20, 2018
commit aa412661449d00a97807bffcdc394c7d656b9230
25 changes: 15 additions & 10 deletions shared/Microsoft.Extensions.WebEncoders.Sources/WebEncoders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,28 +263,22 @@ public static unsafe string Base64UrlEncode(ReadOnlySpan<byte> data)
Debug.Assert(base64Url.Length == written);
});
}
#else
#if !NET461

#elif NETCOREAPP2_0
char[] arrayToReturnToPool = null;
try
{
#endif

var base64Url = base64UrlLen <= MaxStackallocBytes / sizeof(char)
? stackalloc char[base64UrlLen]
#if NET461
: new char[base64UrlLen];
#else
: arrayToReturnToPool = ArrayPool<char>.Shared.Rent(base64UrlLen);
#endif

var status = Base64UrlEncodeCore(data, base64Url, out int consumed, out int written);
Debug.Assert(base64UrlLen == written);

fixed (char* ptr = &MemoryMarshal.GetReference(base64Url))
{
return new string(ptr, 0, written);
}
#if !NET461
}
finally
{
Expand All @@ -293,7 +287,18 @@ public static unsafe string Base64UrlEncode(ReadOnlySpan<byte> data)
ArrayPool<char>.Shared.Return(arrayToReturnToPool);
}
}
#endif
#else
var base64Url = base64UrlLen <= MaxStackallocBytes / sizeof(char)
? stackalloc char[base64UrlLen]
: new char[base64UrlLen];

var status = Base64UrlEncodeCore(data, base64Url, out int consumed, out int written);
Debug.Assert(base64UrlLen == written);

fixed (char* ptr = &MemoryMarshal.GetReference(base64Url))
{
return new string(ptr, 0, written);
}
#endif
}

Expand Down