tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."

Browse source 
* commit '381f64165153bfd4747b99baf838fa280d402d5e':
  Fix readx/writex names.
This commit is contained in:
Dan Albert 2015-02-25 23:32:48 +00:00 committed by Android Git Automerger
commit 11020eae5b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
minadbd/fuse_adb_provider.c
View file

@ -19,9 +19,11 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "sysdeps.h"
#include "adb.h" #include "adb.h"
#include "adb_io.h"
#include "fuse_sideload.h" #include "fuse_sideload.h"
#include "transport.h"
struct adb_data { struct adb_data {
int sfd; // file descriptor for the adb channel 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]; char buf[10];
snprintf(buf, sizeof(buf), "%08u", block); 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)); fprintf(stderr, "failed to write to adb host: %s\n", strerror(errno));
return -EIO; 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)); fprintf(stderr, "failed to read from adb host: %s\n", strerror(errno));
return -EIO; 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) { static void close_adb(void* cookie) {
struct adb_data* ad = (struct adb_data*)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) { int run_adb_fuse(int sfd, uint64_t file_size, uint32_t block_size) {