diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-15 11:24:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-15 11:24:47 -0700 |
| commit | 07a804b83ae9aff836bf6e66eb4f2bbe8f88cc90 (patch) | |
| tree | 5e6ed15af19e8009270a77045e1d6199b330cacd /adb | |
| parent | f0d644fa235418d3f6b7abf53808ee767d650dd2 (diff) | |
| parent | 1dbfce3dfc66046402ccbd1e83928942f824294d (diff) | |
| download | system_core-07a804b83ae9aff836bf6e66eb4f2bbe8f88cc90.tar.gz system_core-07a804b83ae9aff836bf6e66eb4f2bbe8f88cc90.tar.bz2 system_core-07a804b83ae9aff836bf6e66eb4f2bbe8f88cc90.zip | |
merge from open-source master
Change-Id: Ia8d41f96f3885bd7159571182d09c1da079e5bc9
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/sockets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/sockets.c b/adb/sockets.c index 9f1b5987..58dcfbbd 100644 --- a/adb/sockets.c +++ b/adb/sockets.c @@ -366,7 +366,7 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s) asocket *create_local_socket(int fd) { asocket *s = calloc(1, sizeof(asocket)); - if(s == 0) fatal("cannot allocate socket"); + if (s == NULL) fatal("cannot allocate socket"); install_local_socket(s); s->fd = fd; s->enqueue = local_socket_enqueue; @@ -482,7 +482,7 @@ asocket *create_remote_socket(unsigned id, atransport *t) asocket *s = calloc(1, sizeof(aremotesocket)); adisconnect* dis = &((aremotesocket*)s)->disconnect; - if(s == 0) fatal("cannot allocate socket"); + if (s == NULL) fatal("cannot allocate socket"); s->id = id; s->enqueue = remote_socket_enqueue; s->ready = remote_socket_ready; @@ -761,7 +761,7 @@ asocket *create_smart_socket(void (*action_cb)(asocket *s, const char *act)) { D("Creating smart socket \n"); asocket *s = calloc(1, sizeof(asocket)); - if(s == 0) fatal("cannot allocate socket"); + if (s == NULL) fatal("cannot allocate socket"); s->id = 0; s->enqueue = smart_socket_enqueue; s->ready = smart_socket_ready; |