Refactoring

shmuz · Nov 12, 2023 · a3f7518 · a3f7518
1 parent 3594adf
commit a3f7518
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/far/src/copy.cpp b/far/src/copy.cpp
@@ -1152,7 +1152,7 @@ ShellCopy::ShellCopy(Panel *SrcPanel,        // исходная панель (
 			const wchar_t *NamePtr;
 			FARString strNameTmp;
 			// посчитаем количество целей.
-			CountTarget=DestList.GetTotal();
+			CountTarget=DestList.Size();
 			TotalFiles=0;
 			TotalCopySize=TotalCopiedSize=TotalSkippedSize=0;
 			ProgressUpdateTime=0;

diff --git a/far/src/macro/macro.cpp b/far/src/macro/macro.cpp
@@ -3485,7 +3485,7 @@ int FarMacroApi::UDList_Split()
 	auto Subj = Params[1].toString();
 
 	UserDefinedList udl(Flags);
-	if (udl.Set(Subj))
+	if (udl.Set(Subj) && udl.Size())
 	{
 		const wchar_t* str;
 		for (int i=0; (str=udl.Get(i)); i++)

diff --git a/far/src/mix/udlist.hpp b/far/src/mix/udlist.hpp
@@ -128,5 +128,5 @@ class UserDefinedList : private NonCopyable
 		bool IsLastElement(size_t Index) const { return Index + 1 == Array.size(); }
 
 		// Вернуть количество элементов в списке
-		size_t GetTotal() const { return Array.size(); }
+		size_t Size() const { return Array.size(); }
 };