Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Used memcpy instead of iteration code.

Browse source 
svn path=/trunk/; revision=5024
This commit is contained in:
Hartmut Birr 2003-07-09 20:13:56 +00:00
parent edd824b265
commit 5ac5a18db9
2 changed files with 22 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
reactos/lib/ntdll/rtl/unicode.c
View file

@ -1,4 +1,4 @@
/* $Id: unicode.c,v 1.28 2003/05/28 18:09:10 chorns Exp $
/* $Id: unicode.c,v 1.29 2003/07/09 20:13:56 hbirr Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -184,24 +184,13 @@ RtlAppendUnicodeStringToString(
IN OUT PUNICODE_STRING Destination,
IN PUNICODE_STRING Source)
{
PWCHAR Src;
PWCHAR Dest;
ULONG i;
if ((Source->Length + Destination->Length) >= Destination->MaximumLength)
return STATUS_BUFFER_TOO_SMALL;
Src = Source->Buffer;
Dest = Destination->Buffer + (Destination->Length / sizeof (WCHAR));
for (i = 0; i < (Source->Length / sizeof(WCHAR)); i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
Destination->Length += Source->Length;
memcpy((PVOID)Destination->Buffer + Destination->Length, Source->Buffer, Source->Length);
Destination->Length += Source->Length;
Destination->Buffer[Destination->Length / sizeof(WCHAR)] = 0;
return STATUS_SUCCESS;
}
@ -211,9 +200,6 @@ NTSTATUS STDCALL
RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination,
IN PWSTR Source)
{
PWCHAR Src;
PWCHAR Dest;
ULONG i;
ULONG slen;
slen = wcslen(Source) * sizeof(WCHAR);
@ -221,18 +207,9 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination,
if (Destination->Length + slen >= Destination->MaximumLength)
return(STATUS_BUFFER_TOO_SMALL);
Src = Source;
Dest = Destination->Buffer + (Destination->Length / sizeof(WCHAR));
for (i = 0; i < (slen / sizeof(WCHAR)); i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy((PVOID)Destination->Buffer + Destination->Length, Source, slen);
Destination->Length += slen;
Destination->Buffer[Destination->Length / sizeof(WCHAR)] = 0;
return(STATUS_SUCCESS);
}
@ -379,8 +356,7 @@ RtlCopyString(
IN OUT PSTRING DestinationString,
IN PSTRING SourceString)
{
ULONG copylen, i;
PCHAR Src, Dest;
ULONG copylen;
if (SourceString == NULL)
{
@ -390,18 +366,9 @@ RtlCopyString(
copylen = min (DestinationString->MaximumLength - sizeof(CHAR),
SourceString->Length);
Src = SourceString->Buffer;
Dest = DestinationString->Buffer;
for (i = 0; i < copylen; i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy(DestinationString->Buffer, SourceString->Buffer, copylen);
DestinationString->Length = copylen;
DestinationString->Buffer[copylen] = 0;
}
@ -411,8 +378,7 @@ RtlCopyUnicodeString(
IN OUT PUNICODE_STRING DestinationString,
IN PUNICODE_STRING SourceString)
{
ULONG copylen, i;
PWCHAR Src, Dest;
ULONG copylen;
if (SourceString == NULL)
{
@ -422,17 +388,8 @@ RtlCopyUnicodeString(
copylen = min (DestinationString->MaximumLength - sizeof(WCHAR),
SourceString->Length);
Src = SourceString->Buffer;
Dest = DestinationString->Buffer;
for (i = 0; i < (copylen / sizeof (WCHAR)); i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy(DestinationString->Buffer, SourceString->Buffer, copylen);
DestinationString->Buffer[copylen / sizeof(WCHAR)] = 0;
DestinationString->Length = copylen;
}

62
reactos/ntoskrnl/rtl/unicode.c
View file

@ -1,4 +1,4 @@
/* $Id: unicode.c,v 1.28 2003/05/28 18:09:10 chorns Exp $
/* $Id: unicode.c,v 1.29 2003/07/09 20:13:56 hbirr Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -181,23 +181,13 @@ STDCALL
RtlAppendUnicodeStringToString(IN OUT PUNICODE_STRING Destination,
IN PUNICODE_STRING Source)
{
PWCHAR Src, Dest;
ULONG i;
if ((Source->Length + Destination->Length) >= Destination->MaximumLength)
return STATUS_BUFFER_TOO_SMALL;
Src = Source->Buffer;
Dest = Destination->Buffer + (Destination->Length / sizeof (WCHAR));
for (i = 0; i < (Source->Length / sizeof(WCHAR)); i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy((PVOID)Destination->Buffer + Destination->Length, Source->Buffer, Source->Length);
Destination->Length += Source->Length;
Destination->Buffer[Destination->Length / sizeof(WCHAR)] = 0;
return STATUS_SUCCESS;
}
@ -207,9 +197,6 @@ NTSTATUS STDCALL
RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination,
IN PWSTR Source)
{
PWCHAR Src;
PWCHAR Dest;
ULONG i;
ULONG slen;
slen = wcslen(Source) * sizeof(WCHAR);
@ -217,17 +204,7 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination,
if (Destination->Length + slen >= Destination->MaximumLength)
return(STATUS_BUFFER_TOO_SMALL);
Src = Source;
Dest = Destination->Buffer + (Destination->Length / sizeof(WCHAR));
for (i = 0; i < (slen / sizeof(WCHAR)); i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy((PVOID)Destination->Buffer + Destination->Length, Source, slen + sizeof(WCHAR));
Destination->Length += slen;
return(STATUS_SUCCESS);
@ -371,8 +348,7 @@ STDCALL
RtlCopyString(IN OUT PSTRING DestinationString,
IN PSTRING SourceString)
{
ULONG copylen, i;
PCHAR Src, Dest;
ULONG copylen;
if(SourceString == NULL)
{
@ -382,17 +358,9 @@ RtlCopyString(IN OUT PSTRING DestinationString,
copylen = min (DestinationString->MaximumLength - sizeof(CHAR),
SourceString->Length);
Src = SourceString->Buffer;
Dest = DestinationString->Buffer;
for (i = 0; i < copylen; i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy(DestinationString->Buffer, SourceString->Buffer, copylen);
DestinationString->Buffer[copylen] = 0;
DestinationString->Length = copylen;
}
@ -402,8 +370,7 @@ STDCALL
RtlCopyUnicodeString(IN OUT PUNICODE_STRING DestinationString,
IN PUNICODE_STRING SourceString)
{
ULONG copylen, i;
PWCHAR Src, Dest;
ULONG copylen;
if(SourceString==NULL)
{
@ -413,17 +380,8 @@ RtlCopyUnicodeString(IN OUT PUNICODE_STRING DestinationString,
copylen = min(DestinationString->MaximumLength - sizeof(WCHAR),
SourceString->Length);
Src = SourceString->Buffer;
Dest = DestinationString->Buffer;
for (i = 0; i < (copylen / sizeof (WCHAR)); i++)
{
*Dest = *Src;
Dest++;
Src++;
}
*Dest = 0;
memcpy(DestinationString->Buffer, SourceString->Buffer, copylen);
DestinationString->Buffer[copylen / sizeof(WCHAR)] = 0;
DestinationString->Length = copylen;
}