From e0924ea3334a18c7540bce2c16642d5be05a9c80 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 20 Mar 2018 15:18:16 +0300
Subject: [PATCH] Fixed several bugs found by PVS-Studio by
 @SvyatoslavRazmyslov.

GitOrigin-RevId: 768d822ff74740fe71c16ea1bba3c6fb74f01b15
---
 td/telegram/cli.cpp                | 5 +----
 td/telegram/files/FileGcWorker.cpp | 2 +-
 td/telegram/files/FileManager.cpp  | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index b4d28a72..ec69f826 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -2565,10 +2565,7 @@ class CliClient final : public Actor {
 
       std::tie(chat_id, args) = split(args);
       std::tie(user_id, status_str) = split(args);
-      if (status_str == "admin") {
-        status =
-            make_tl_object<td_api::chatMemberStatusAdministrator>(true, true, true, true, true, true, true, true, true);
-      } else if (status_str == "member") {
+      if (status_str == "member") {
         status = make_tl_object<td_api::chatMemberStatusMember>();
       } else if (status_str == "left") {
         status = make_tl_object<td_api::chatMemberStatusLeft>();
diff --git a/td/telegram/files/FileGcWorker.cpp b/td/telegram/files/FileGcWorker.cpp
index 0f734d39..35dce38e 100644
--- a/td/telegram/files/FileGcWorker.cpp
+++ b/td/telegram/files/FileGcWorker.cpp
@@ -122,7 +122,7 @@ void FileGcWorker::run_gc(const FileGcParameters &parameters, std::vector<FullFi
       files.end());
 
   // sort by max(atime, mtime)
-  std::sort(files.begin(), files.end(), [](const auto &a, const auto &b) { return a.atime_nsec < a.atime_nsec; });
+  std::sort(files.begin(), files.end(), [](const auto &a, const auto &b) { return a.atime_nsec < b.atime_nsec; });
 
   // 1. Total memory must be less than max_memory
   // 2. Total file count must be less than MAX_FILE_COUNT
diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 3a4be77b..dc5e2d1c 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -923,7 +923,7 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
   if (!y_file_id.is_valid()) {
     return x_node->main_file_id_;
   }
-  FileNodePtr y_node = no_sync ? get_file_node(y_file_id) : get_file_node(y_file_id);
+  FileNodePtr y_node = get_file_node(y_file_id);
   if (!y_node) {
     return Status::Error(PSLICE() << "Can't merge files. Second id is invalid: " << x_file_id << " and " << y_file_id);
   }