Merge "adb: fix mistaken uses of SendFail in file_sync_service.cpp." am: 2d2185ee09
am: f2610942ef
* commit 'f2610942efca1857c377df4f427ffaa3eefe65e8':
adb: fix mistaken uses of SendFail in file_sync_service.cpp.
diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index ef0418e..29c6629 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -130,6 +130,9 @@
return WriteFdExactly(s, &msg.dent, sizeof(msg.dent));
}
+// Make sure that SendFail from adb_io.cpp isn't accidentally used in this file.
+#pragma GCC poison SendFail
+
static bool SendSyncFail(int fd, const std::string& reason) {
D("sync: failure: %s", reason.c_str());
@@ -265,7 +268,7 @@
msg.status.msglen = 0;
if (!WriteFdExactly(s, &msg.status, sizeof(msg.status))) return false;
} else {
- SendFail(s, "invalid data message: expected ID_DONE");
+ SendSyncFail(s, "invalid data message: expected ID_DONE");
return false;
}
@@ -277,7 +280,7 @@
// 'spec' is of the form "/some/path,0755". Break it up.
size_t comma = spec.find_last_of(',');
if (comma == std::string::npos) {
- SendFail(s, "missing , in ID_SEND");
+ SendSyncFail(s, "missing , in ID_SEND");
return false;
}
@@ -286,7 +289,7 @@
errno = 0;
mode_t mode = strtoul(spec.substr(comma + 1).c_str(), nullptr, 0);
if (errno != 0) {
- SendFail(s, "bad mode");
+ SendSyncFail(s, "bad mode");
return false;
}