General cleanup and refactor.

This commit is contained in:
2022-03-07 07:36:42 +00:00
parent bfca01481a
commit 1502ea91c1
13 changed files with 423 additions and 852 deletions

View File

@@ -30,11 +30,11 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.Helpers;
using System;
using System.Text;
namespace Aaru.Helpers;
/// <summary>Helper operations to work with strings</summary>
public static class StringHandlers
{
@@ -54,7 +54,7 @@ public static class StringHandlers
if(cString == null)
return null;
int len = 0;
var len = 0;
for(int i = start; i < cString.Length; i++)
{
@@ -78,7 +78,7 @@ public static class StringHandlers
if(twoBytes && len % 2 > 0)
len--;
byte[] dest = new byte[len];
var dest = new byte[len];
Array.Copy(cString, start, dest, 0, len);
return len == 0 ? "" : encoding.GetString(dest);
@@ -100,7 +100,7 @@ public static class StringHandlers
return null;
byte length = pascalString[start];
int len = 0;
var len = 0;
for(int i = start + 1; i < length + 1 && i < pascalString.Length; i++)
{
@@ -110,7 +110,7 @@ public static class StringHandlers
len++;
}
byte[] dest = new byte[len];
var dest = new byte[len];
Array.Copy(pascalString, start + 1, dest, 0, len);
return len == 0 ? "" : encoding.GetString(dest);
@@ -157,13 +157,13 @@ public static class StringHandlers
{
ushort unicode;
byte compId = dstring[0];
string temp = "";
var temp = "";
if(compId != 8 &&
compId != 16)
return null;
for(int byteIndex = 1; byteIndex < dstring.Length;)
for(var byteIndex = 1; byteIndex < dstring.Length;)
{
if(compId == 16)
unicode = (ushort)(dstring[byteIndex++] << 8);