diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-24 22:48:25 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-02-25 15:08:15 -0800 |
| commit | 432584fccc1455532d824c21ff578b3bfcef92ce (patch) | |
| tree | 4557180d7c7f95c448471a1c174e65933a7b9f1d /minadbd | |
| parent | 12fa5191e76d119f4f3998a4b8821f87aa4f9fad (diff) | |
| download | bootable_recovery-432584fccc1455532d824c21ff578b3bfcef92ce.zip bootable_recovery-432584fccc1455532d824c21ff578b3bfcef92ce.tar.gz bootable_recovery-432584fccc1455532d824c21ff578b3bfcef92ce.tar.bz2 | |
Fix readx/writex names.
Change-Id: I9556960b8293ea0e81def8b73f88edadb68841e3
Diffstat (limited to 'minadbd')
| -rw-r--r-- | minadbd/fuse_adb_provider.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/minadbd/fuse_adb_provider.c b/minadbd/fuse_adb_provider.c index 2386e82..300e3c7 100644 --- a/minadbd/fuse_adb_provider.c +++ b/minadbd/fuse_adb_provider.c @@ -19,9 +19,11 @@ #include <string.h> #include <errno.h> +#include "sysdeps.h" + #include "adb.h" +#include "adb_io.h" #include "fuse_sideload.h" -#include "transport.h" struct adb_data { int sfd; // file descriptor for the adb channel @@ -35,12 +37,12 @@ static int read_block_adb(void* cookie, uint32_t block, uint8_t* buffer, uint32_ char buf[10]; snprintf(buf, sizeof(buf), "%08u", block); - if (writex(ad->sfd, buf, 8) < 0) { + if (!WriteStringFully(ad->sfd, buf)) { fprintf(stderr, "failed to write to adb host: %s\n", strerror(errno)); return -EIO; } - if (readx(ad->sfd, buffer, fetch_size) < 0) { + if (!WriteFdExactly(ad->sfd, buffer, fetch_size)) { fprintf(stderr, "failed to read from adb host: %s\n", strerror(errno)); return -EIO; } @@ -51,7 +53,7 @@ static int read_block_adb(void* cookie, uint32_t block, uint8_t* buffer, uint32_ static void close_adb(void* cookie) { struct adb_data* ad = (struct adb_data*)cookie; - writex(ad->sfd, "DONEDONE", 8); + WriteStringFully(ad->sfd, "DONEDONE"); } int run_adb_fuse(int sfd, uint64_t file_size, uint32_t block_size) { |