Skip to content

delete deadcode from nsutilpriv.h #108104

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

Merged
jkotas merged 2 commits into from
Sep 22, 2024
Merged

delete deadcode from nsutilpriv.h #108104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f94b28
delete deadcode from nsutilpriv.h
kasperk81 Sep 21, 2024
9f6ab10
review
kasperk81 Sep 22, 2024
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
97 changes: 3 additions & 94 deletions src/coreclr/inc/nsutilpriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

//*****************************************************************************
// NSUtilPriv.h
//
// Helpers for converting namespace separators.
//
//*****************************************************************************

#ifndef __NSUTILPRIV_H__
Expand All @@ -15,7 +15,6 @@ class SString;

struct ns
{

//*****************************************************************************
// Determine how many chars large a fully qualified name would be given the
// two parts of the name. The return value includes room for every character
Expand Down Expand Up @@ -43,7 +42,6 @@ static
int IsValidName( // true if valid, false invalid.
LPCUTF8 szName); // Name to parse.


//*****************************************************************************
// Scan the string from the rear looking for the first valid separator. If
// found, return a pointer to it. Else return null. This code is smart enough
Expand All @@ -61,34 +59,22 @@ static
LPUTF8 FindSep( // Pointer to separator or null.
LPCUTF8 szPath); // The path to look in.


//*****************************************************************************
// Take a path and find the last separator (nsFindSep), and then replace the
// separator with a '\0' and return a pointer to the name. So for example:
// a.b.c
// becomes two strings "a.b" and "c" and the return value points to "c".
//*****************************************************************************
static
WCHAR *SplitInline( // Pointer to name portion.
__inout __inout_z WCHAR *szPath); // The path to split.

static
LPUTF8 SplitInline( // Pointer to name portion.
__inout __inout_z LPUTF8 szPath); // The path to split.

static
void SplitInline(
__inout __inout_z LPWSTR szPath, // Path to split.
LPCWSTR &szNameSpace, // Return pointer to namespace.
LPCWSTR &szName); // Return pointer to name.

static
void SplitInline(
__inout __inout_z LPUTF8 szPath, // Path to split.
LPCUTF8 &szNameSpace, // Return pointer to namespace.
LPCUTF8 &szName); // Return pointer to name.


//*****************************************************************************
// Split the last parsable element from the end of the string as the name,
// the first part as the namespace.
Expand All @@ -109,7 +95,6 @@ int SplitPath( // true ok, false trunction.
_Out_writes_opt_ (cchName) LPUTF8 szName, // Output for name.
int cchName); // Max chars for output.


//*****************************************************************************
// Take two values and put them together in a fully qualified path using the
// correct separator.
Expand All @@ -128,31 +113,6 @@ int MakePath( // true ok, false truncation.
LPCUTF8 szNameSpace, // Namespace.
LPCUTF8 szName); // Name.

static
int MakePath( // true ok, false truncation.
_Out_writes_(cchChars) WCHAR *szOut, // output path for name.
int cchChars, // max chars for output path.
LPCUTF8 szNameSpace, // Namespace.
LPCUTF8 szName); // Name.

static
int MakePath( // true ok, false out of memory
CQuickBytes &qb, // Where to put results.
LPCUTF8 szNameSpace, // Namespace for name.
LPCUTF8 szName); // Final part of name.

static
int MakePath( // true ok, false out of memory
CQuickArray<WCHAR> &qa, // Where to put results.
LPCUTF8 szNameSpace, // Namespace for name.
LPCUTF8 szName); // Final part of name.

static
int MakePath( // true ok, false out of memory
CQuickBytes &qb, // Where to put results.
const WCHAR *szNameSpace, // Namespace for name.
const WCHAR *szName); // Final part of name.

static
void MakePath( // throws on out of memory
SString &ssBuf, // Where to put results.
Expand All @@ -176,46 +136,12 @@ bool MakeAssemblyQualifiedName( // true o
int dwTypeName, // Number of characters (not including null)
const WCHAR *szAssemblyName, // Final part of name.
int dwAssemblyName); // Number of characters (not including null)

static
int MakeNestedTypeName( // true ok, false out of memory
Copy link
Member

@jkotas jkotas Sep 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MakeNestedTypeName is used

Copy link
Contributor Author

@kasperk81 kasperk81 Sep 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only third one with stack string is in use

CQuickBytes &qb, // Where to put results.
LPCUTF8 szEnclosingName, // Full name for enclosing type
LPCUTF8 szNestedName); // Full name for nested type

static
int MakeNestedTypeName( // true ok, false truncation.
_Out_writes_ (cchChars) LPUTF8 szOut, // output path for name.
int cchChars, // max chars for output path.
LPCUTF8 szEnclosingName, // Full name for enclosing type
LPCUTF8 szNestedName); // Full name for nested type

static
void MakeNestedTypeName( // throws on out of memory
SString &ssBuf, // output path for name.
const SString &ssEnclosingName, // Full name for enclosing type
const SString &ssNestedName); // Full name for nested type
}; // struct ns

#ifndef NAMESPACE_SEPARATOR_CHAR
#define NAMESPACE_SEPARATOR_CHAR '.'
#define NAMESPACE_SEPARATOR_WCHAR W('.')
#define NAMESPACE_SEPARATOR_STR "."
#define NAMESPACE_SEPARATOR_WSTR W(".")
#define NAMESPACE_SEPARATOR_LEN 1
#define ASSEMBLY_SEPARATOR_CHAR ','
#define ASSEMBLY_SEPARATOR_WCHAR W(',')
#define ASSEMBLY_SEPARATOR_STR ", "
#define ASSEMBLY_SEPARATOR_WSTR W(", ")
#define ASSEMBLY_SEPARATOR_LEN 2
#define NESTED_SEPARATOR_CHAR '+'
#define NESTED_SEPARATOR_WCHAR W('+')
#define NESTED_SEPARATOR_STR "+"
#define NESTED_SEPARATOR_WSTR W("+")
#endif

#define EMPTY_STR ""
#define EMPTY_WSTR W("")

#define MAKE_FULL_PATH_ON_STACK_UTF8(toptr, pnamespace, pname) \
{ \
Expand All @@ -224,20 +150,11 @@ void MakeNestedTypeName( // throws on out of memory
ns::MakePath(toptr, __i##toptr, pnamespace, pname); \
}

#define MAKE_FULL_PATH_ON_STACK_UNICODE(toptr, pnamespace, pname) \
{ \
int __i##toptr = ns::GetFullLength(pnamespace, pname); \
toptr = (WCHAR *) alloca(__i##toptr * sizeof(WCHAR)); \
ns::MakePath(toptr, __i##toptr, pnamespace, pname); \
}

#define MAKE_FULLY_QUALIFIED_NAME(pszFullyQualifiedName, pszNameSpace, pszName) MAKE_FULL_PATH_ON_STACK_UTF8(pszFullyQualifiedName, pszNameSpace, pszName)

#define MAKE_FULLY_QUALIFIED_MEMBER_NAME(ptr, pszNameSpace, pszClassName, pszMemberName, pszSig) \
{ \
int __i##ptr = ns::GetFullLength(pszNameSpace, pszClassName); \
__i##ptr += (pszMemberName ? (int) strlen(pszMemberName) : 0); \
__i##ptr += (NAMESPACE_SEPARATOR_LEN * 2); \
__i##ptr += (int)strlen(NAMESPACE_SEPARATOR_STR) * 2; \
__i##ptr += (pszSig ? (int) strlen(pszSig) : 0); \
ptr = (LPUTF8) alloca(__i##ptr); \
ns::MakePath(ptr, __i##ptr, pszNameSpace, pszClassName); \
Expand All @@ -252,12 +169,4 @@ void MakeNestedTypeName( // throws on out of memory
} \
}

#ifdef _PREFAST_
// need to eliminate the expansion of MAKE_FULLY_QUALIFIED_MEMBER_NAME in prefast
// builds to prevent it complaining about the potential for NULLs to strlen and strcat
#undef MAKE_FULLY_QUALIFIED_MEMBER_NAME
// need to set ptr=NULL so we don't get a build error because ptr isn't inited in a couple cases
#define MAKE_FULLY_QUALIFIED_MEMBER_NAME(ptr, pszNameSpace, pszClassName, pszMemberName, pszSig) ptr=NULL;
#endif

#endif
#endif // __NSUTILPRIV_H__
Loading