commit 1dbfce3dfc66046402ccbd1e83928942f824294d
author Jean-Baptiste Queru <jbq@google.com> Tue Jun 15 09:24:23 2010 -0700
committer Android Code Review <code-review@android.com> Tue Jun 15 09:24:23 2010 -0700
tree 61443d1a0250f75d1952c1392d3cf801169f4b59
parent 62f4d86b7c9143860bc5e9679382fcf159b788b4
parent c419e2a210ad7e37a1f749f2ab4de7c7f95b90d7

Merge "adb: clean up 0 --> NULL for pointers"

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index 9f1b598..58dcfbb 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -366,7 +366,7 @@
 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 *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 @@
 {
     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;