Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dbfce3d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

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

parents 62f4d86b c419e2a2

adb/sockets.c

+3 −3
Original line number Diff line number Diff line
@@ -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;