repo: some cleanup

Author: RaphaelIT7

source/modules/entitylist.cpp

@@ -242,7 +242,7 @@ LUA_FUNCTION_STATIC(GetGlobalEntityList)
 void CEntListModule::OnEntityDeleted(CBaseEntity* pEntity)
 {
 	if (g_pEntListModule.InDebug())
-		Msg("Deleted Entity: %p (%i)\n", pEntity, pEntityLists.size());
+		Msg("Deleted Entity: %p (%i)\n", pEntity, (int)pEntityLists.size());
 
 	for (EntityList* pList : pEntityLists)
 	{
@@ -261,7 +261,7 @@ void CEntListModule::OnEntityCreated(CBaseEntity* pEntity)
 	g_pGlobalEntityList.AddEntity(pEntity);
 
 	if (g_pEntListModule.InDebug())
-		Msg("Created Entity %p (%p, %i)\n", pEntity, &g_pGlobalEntityList, pEntityLists.size());
+		Msg("Created Entity %p (%p, %i)\n", pEntity, &g_pGlobalEntityList, (int)pEntityLists.size());
 }
 
 void CEntListModule::LuaInit(bool bServerInit)

source/modules/filesystem.cpp

@@ -525,7 +525,7 @@ static void DumpSearchCacheCmd(const CCommand& args)
 {
 	for (auto& [key, val] : g_pAbsoluteSearchCache)
 	{
-		Msg("Key: %s (%i)\nValue: %s (%i)\n", key.data(), key.length(), val.data(), val.length());
+		Msg("Key: %s (%i)\nValue: %s (%i)\n", key.data(), (int)key.length(), val.data(), (int)val.length());
 	}
 }
 static ConCommand dumpabsolutesearchcache("holylib_filesystem_dumpabsolutesearchcache", DumpSearchCacheCmd, "Dumps the absolute search cache", 0);
@@ -1647,6 +1647,12 @@ void CFileSystemModule::Init(CreateInterfaceFn* appfn, CreateInterfaceFn* gamefn
 static CUtlSymbolTableMT* g_pPathIDTable;
 inline const char* CPathIDInfo::GetPathIDString() const
 {
+	/*
+	 * Why don't we return m_pDebugPathID to not rely on g_pPathIDTable?
+	 * Because then in RARE cases it can happen that m_pDebugPathID contains a INVALID value causing random and difficult to debug crashes.
+	 * This had happen in https://github.com/RaphaelIT7/gmod-holylib/issues/23 where it would result in crashes inside strlen calls on the string.
+	 */
+
 	return g_pPathIDTable->String( m_PathID );
 }
 
@@ -1664,24 +1670,6 @@ inline const char* CSearchPath::GetPathString() const
 	return func_CBaseFileSystem_CSearchPath_GetDebugString((void*)this); // Look into this to possibly remove the GetDebugString function.
 }
 
-inline const char* CBaseFileSystem::CPathIDInfo::GetPathIDString() const
-{
-	return m_pDebugPathID; // This should remove the requirement for g_pPathIDTable.
-}
-
-inline const char* CBaseFileSystem::CSearchPath::GetPathIDString() const // Remove this duplicate later :<
-{
-	if (m_pPathIDInfo)
-		return m_pPathIDInfo->GetPathIDString(); // When can we nuke it :>
-
-	return NULL;
-}
-
-inline const char* CBaseFileSystem::CSearchPath::GetPathString() const
-{
-	return func_CBaseFileSystem_CSearchPath_GetDebugString((void*)this); // Look into this to possibly remove the GetDebugString function.
-}
-
 void CFileSystemModule::InitDetour(bool bPreServer)
 {
 	if (!bPreServer)

source/sourcesdk/filesystem_things.h

@@ -700,117 +700,10 @@ abstract_class CBaseFileSystem : public CTier1AppSystem< IFileSystem >
 	// Unregister a CMemoryFileBacking; must balance with RegisterMemoryFile.
 	virtual void UnregisterMemoryFile( CMemoryFileBacking *pFile );
 
-	//------------------------------------
-	// Synchronous path for file operations
-	//------------------------------------
-	class CPathIDInfo
-	{
-	public:
-		CPathIDInfo() : m_bByRequestOnly(), m_pDebugPathID() {}
-		const CUtlSymbol& GetPathID() const;
-		const char* GetPathIDString() const;
-		void SetPathID( CUtlSymbol id );
-
-	public:
-		// See MarkPathIDByRequestOnly.
-		bool m_bByRequestOnly;
-
-	public:
-		CUtlSymbol m_PathID;
-		const char *m_pDebugPathID;
-	};
-
 	////////////////////////////////////////////////
 	// IMPLEMENTATION DETAILS FOR CBaseFileSystem //
 	////////////////////////////////////////////////
 
-	class CSearchPath
-	{
-	public:
-							CSearchPath( void );
-							~CSearchPath( void );
-
-		const char* GetPathString() const;
-		const char* GetDebugString() const;
-		
-		// Path ID ("game", "mod", "gamebin") accessors.
-		const CUtlSymbol& GetPathID() const;
-		const char* GetPathIDString() const;
-
-		// Search path (c:\hl2\hl2) accessors.
-		void SetPath( CUtlSymbol id );
-		const CUtlSymbol& GetPath() const;
-
-		void SetPackFile(CPackFile *pPackFile) { m_pPackFile = pPackFile; }
-		CPackFile *GetPackFile() const { return m_pPackFile; }
-
-		#ifdef SUPPORT_PACKED_STORE
-		void SetPackedStore( CPackedStoreRefCount *pPackedStore ) { /*m_pPackedStore = pPackedStore;*/ }
-		#endif
-		CPackedStoreRefCount *GetPackedStore() const { return m_pPackedStore; }
-
-		bool IsMapPath() const;
-
-		int					m_storeId;
-
-		// Used to track if its search 
-		CPathIDInfo			*m_pPathIDInfo;
-
-		bool				m_bIsRemotePath;
-
-		bool				m_bIsTrustedForPureServer;
-
-	private:
-		CUtlSymbol			m_Path;
-		const char			*m_pDebugPath;
-		CPackFile			*m_pPackFile;
-		CPackedStoreRefCount *m_pPackedStore;
-	};
-
-	class CSearchPathsVisits
-	{
-	public:
-		void Reset()
-		{
-			m_Visits.RemoveAll();
-		}
-
-		bool MarkVisit( const CSearchPath &searchPath )
-		{
-			if ( m_Visits.Find( searchPath.m_storeId ) == m_Visits.InvalidIndex() )
-			{
-				MEM_ALLOC_CREDIT();
-				m_Visits.AddToTail( searchPath.m_storeId );
-				return false;
-			}
-			return true;
-		}
-
-	private:
-		CUtlVector<int> m_Visits;	// This is a copy of IDs for the search paths we've visited, so 
-	};
-
-	class CSearchPathsIterator
-	{
-	public:
-		CSearchPath *GetFirst();
-		CSearchPath *GetNext();
-
-	private:
-		CSearchPathsIterator( const  CSearchPathsIterator & );
-		void operator=(const CSearchPathsIterator &);
-		void CopySearchPaths( const CUtlVector<CSearchPath>	&searchPaths );
-
-		int							m_iCurrent;
-		CUtlSymbol					m_pathID;
-		CUtlVector<CSearchPath> 	m_SearchPaths;
-		CSearchPathsVisits			m_visits;
-		CSearchPath					m_EmptySearchPath;
-		CPathIDInfo					m_EmptyPathIDInfo;
-		PathTypeFilter_t			m_PathTypeFilter;
-		char						m_Filename[MAX_PATH];	// set for relative names only
-	};
-
 	friend class CSearchPathsIterator;
 
 	struct FindData_t