[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-856-g9d9f945

[Stefan Metzmacher]

The branch, master has been updated
       via  9d9f9452815f99dae61976b843af14f54c42009c (commit)
      from  89278b18195484d3ea5d25e8b19871d64d218a05 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9d9f9452815f99dae61976b843af14f54c42009c
Author: Stefan Metzmacher <me...@samba.org>
Date:   Fri Apr 3 14:29:51 2009 +0200

    tsocket: use the correct 'ret' variable for tdgram_disconnect_send/recv()
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/tsocket/tsocket_bsd.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 4ccaff4..6d27cca 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -1658,7 +1658,7 @@ static ssize_t tdgram_bsd_sendto_recv(struct tevent_req 
*req, int *perrno)
 }
 
 struct tdgram_bsd_disconnect_state {
-       int ret;
+       void *__dummy;
 };
 
 static struct tevent_req *tdgram_bsd_disconnect_send(TALLOC_CTX *mem_ctx,
@@ -1677,7 +1677,6 @@ static struct tevent_req 
*tdgram_bsd_disconnect_send(TALLOC_CTX *mem_ctx,
        if (req == NULL) {
                return NULL;
        }
-       state->ret = -1;
 
        if (bsds->read_req || bsds->write_req) {
                tevent_req_error(req, EBUSY);
@@ -1689,7 +1688,7 @@ static struct tevent_req 
*tdgram_bsd_disconnect_send(TALLOC_CTX *mem_ctx,
                goto post;
        }
 
-       state->ret = close(bsds->fd);
+       ret = close(bsds->fd);
        bsds->fd = -1;
        err = tsocket_error_from_errno(ret, errno, &dummy);
        if (tevent_req_error(req, err)) {
@@ -1705,14 +1704,9 @@ post:
 static int tdgram_bsd_disconnect_recv(struct tevent_req *req,
                                      int *perrno)
 {
-       struct tdgram_bsd_disconnect_state *state = tevent_req_data(req,
-                                       struct tdgram_bsd_disconnect_state);
        int ret;
 
        ret = tsocket_simple_int_recv(req, perrno);
-       if (ret == 0) {
-               ret = state->ret;
-       }
 
        tevent_req_received(req);
        return ret;


-- 
Samba Shared Repository