[Heimdal-source-changes] [Heimdal] branch master updated. heimdal-1.5pre2-761-g6294c36

[lha at h5l.org]

The branch master has been updated
       via 6294c36 avoid -Wshadow
       via a95cae1 Fix typo with return values in realloc_descrs.
      from 9ad7632 fix -Wshadow

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

commit a95cae113dcb043e5a32d6576db82daaf4569ab2
Author: Dana Koch <dsk at google.com>
Date:   Thu Nov 22 11:20:48 2012 +0800

    Fix typo with return values in realloc_descrs.
    
    Signed-off-by: Love Hörnquist Åstrand <lha at h5l.org>

a95cae113dcb043e5a32d6576db82daaf4569ab2
diff --git a/kdc/connect.c b/kdc/connect.c
index 3df9b5a..9083b85 100644
--- a/kdc/connect.c
+++ b/kdc/connect.c
@@ -832,7 +832,7 @@ realloc_descrs(struct descr **d, unsigned int *ndescr)
 
     tmp = realloc(*d, (*ndescr + 4) * sizeof(**d));
     if(tmp == NULL)
-        return TRUE;
+        return FALSE;
 
     *d = tmp;
     reinit_descrs (*d, *ndescr);
@@ -842,7 +842,7 @@ realloc_descrs(struct descr **d, unsigned int *ndescr)
 
     *ndescr += 4;
 
-    return FALSE;
+    return TRUE;
 }
 
 int

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

commit 6294c365269260904a928da30b8b3c595382e4e5
Author: Love Hörnquist Åstrand <lha at h5l.org>
Date:   Thu Nov 22 17:27:21 2012 -0800

    avoid -Wshadow

6294c365269260904a928da30b8b3c595382e4e5
diff --git a/lib/ipc/server.c b/lib/ipc/server.c
index d53a1ed..2fcc548 100644
--- a/lib/ipc/server.c
+++ b/lib/ipc/server.c
@@ -336,14 +336,14 @@ mach_init(const char *service, mach_port_t sport, heim_sipc ctx)
 	});
 
     dispatch_source_set_cancel_handler(s->source, ^{
-	    heim_sipc ctx = dispatch_get_context(dispatch_get_current_queue());
-	    struct mach_service *st = ctx->mech;
+	    heim_sipc sctx = dispatch_get_context(dispatch_get_current_queue());
+	    struct mach_service *st = sctx->mech;
 	    mach_port_mod_refs(mach_task_self(), st->sport,
 			       MACH_PORT_RIGHT_RECEIVE, -1);
 	    dispatch_release(st->queue);
 	    dispatch_release(st->source);
 	    free(st);
-	    free(ctx);
+	    free(sctx);
 	});
 
     dispatch_resume(s->source);

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

Summary of changes:
 kdc/connect.c    |    4 ++--
 lib/ipc/server.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)