================
@@ -32,50 +34,14 @@ class AdbClient {
using DeviceIDList = std::list<std::string>;
- class SyncService {
- friend class AdbClient;
-
- public:
- virtual ~SyncService();
-
- virtual Status PullFile(const FileSpec &remote_file,
- const FileSpec &local_file);
-
- Status PushFile(const FileSpec &local_file, const FileSpec &remote_file);
-
- virtual Status Stat(const FileSpec &remote_file, uint32_t &mode,
- uint32_t &size, uint32_t &mtime);
-
- bool IsConnected() const;
-
- protected:
- explicit SyncService(std::unique_ptr<Connection> &&conn);
-
- private:
- Status SendSyncRequest(const char *request_id, const uint32_t data_len,
- const void *data);
-
- Status ReadSyncHeader(std::string &response_id, uint32_t &data_len);
-
- Status PullFileChunk(std::vector<char> &buffer, bool &eof);
-
- Status ReadAllBytes(void *buffer, size_t size);
-
- Status internalPullFile(const FileSpec &remote_file,
- const FileSpec &local_file);
-
- Status internalPushFile(const FileSpec &local_file,
- const FileSpec &remote_file);
-
- Status internalStat(const FileSpec &remote_file, uint32_t &mode,
- uint32_t &size, uint32_t &mtime);
-
- Status executeCommand(const std::function<Status()> &cmd);
-
- std::unique_ptr<Connection> m_conn;
- };
-
- static Status CreateByDeviceID(const std::string &device_id, AdbClient &adb);
+ /// Resolves a device identifier to its canonical form.
+ ///
+ /// \param device_id the device identifier to resolve (may be empty).
+ /// \param [out] resolved_device_id filled with the canonical device ID.
+ ///
+ /// \returns Status object indicating success or failure. Returns error if
+ /// the device ID cannot be resolved or is ambiguous.
+ static Status ResolveDeviceID(const std::string &device_id, std::string
&resolved_device_id);
----------------
labath wrote:
```suggestion
static llvm::Expected<std::string> ResolveDeviceID(llvm::StringRef device_id);
```
https://github.com/llvm/llvm-project/pull/145382
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
