summaryrefslogtreecommitdiffstats
path: root/minadbd
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-14 22:02:33 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 22:02:33 +0100
commit52d0b765ab58e7def9783623092f1891a4d7f427 (patch)
tree4531013dc846bac91acdae211592c0e811cfef4e /minadbd
parentam a7266ef0: Merge "separate fbdev-specific code out from minui" (diff)
parentMerge "Recovery 64-bit compile issues" (diff)
downloadandroid_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.tar
android_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.tar.gz
android_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.tar.bz2
android_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.tar.lz
android_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.tar.xz
android_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.tar.zst
android_bootable_recovery-52d0b765ab58e7def9783623092f1891a4d7f427.zip
Diffstat (limited to 'minadbd')
-rw-r--r--minadbd/sockets.c3
-rw-r--r--minadbd/transport.c4
-rw-r--r--minadbd/usb_linux_client.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/minadbd/sockets.c b/minadbd/sockets.c
index 2dd646159..817410d13 100644
--- a/minadbd/sockets.c
+++ b/minadbd/sockets.c
@@ -319,7 +319,8 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
while(avail > 0) {
r = adb_read(fd, x, avail);
- D("LS(%d): post adb_read(fd=%d,...) r=%d (errno=%d) avail=%d\n", s->id, s->fd, r, r<0?errno:0, avail);
+ D("LS(%d): post adb_read(fd=%d,...) r=%d (errno=%d) avail=%zu\n",
+ s->id, s->fd, r, r<0?errno:0, avail);
if(r > 0) {
avail -= r;
x += r;
diff --git a/minadbd/transport.c b/minadbd/transport.c
index 4c0c97f75..92679f518 100644
--- a/minadbd/transport.c
+++ b/minadbd/transport.c
@@ -713,7 +713,7 @@ int readx(int fd, void *ptr, size_t len)
char *p = ptr;
int r;
#if ADB_TRACE
- int len0 = len;
+ size_t len0 = len;
#endif
D("readx: fd=%d wanted=%d\n", fd, (int)len);
while(len > 0) {
@@ -734,7 +734,7 @@ int readx(int fd, void *ptr, size_t len)
}
#if ADB_TRACE
- D("readx: fd=%d wanted=%d got=%d\n", fd, len0, len0 - len);
+ D("readx: fd=%d wanted=%zu got=%zu\n", fd, len0, len0 - len);
dump_hex( ptr, len0 );
#endif
return 0;
diff --git a/minadbd/usb_linux_client.c b/minadbd/usb_linux_client.c
index c135d6396..29bab1558 100644
--- a/minadbd/usb_linux_client.c
+++ b/minadbd/usb_linux_client.c
@@ -388,7 +388,7 @@ static int bulk_read(int bulk_out, char *buf, size_t length)
ret = adb_read(bulk_out, buf + count, length - count);
if (ret < 0) {
if (errno != EINTR) {
- D("[ bulk_read failed fd=%d length=%d count=%d ]\n",
+ D("[ bulk_read failed fd=%d length=%zu count=%zu ]\n",
bulk_out, length, count);
return ret;
}