Merge branch 'master' into xkb

Conflicts:
	console-client/Makefile

9 files changed, 11 insertions, 12 deletions

diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile
index 0787d2d6..31a940ff 100644
--- a/libshouldbeinlibc/Makefile
+++ b/libshouldbeinlibc/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libshouldbeinlibc
 #
-#   Copyright (C) 1995,96,97,98,99,2002 Free Software Foundation, Inc.
+#   Copyright (C) 1995,96,97,98,99,2002,2012 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -30,7 +30,6 @@ SRCS = termsize.c timefmt.c exec-reauth.c maptime-funcs.c \
        ugids-verify-auth.c
 installhdrs = idvec.h timefmt.h maptime.h \
 	      wire.h portinfo.h portxlate.h cacheq.h ugids.h
-LCLHDRS = $(installhdrs)
 installhdrsubdir = .
 
 OBJS = $(SRCS:.c=.o)
diff --git a/libshouldbeinlibc/exec-reauth.c b/libshouldbeinlibc/exec-reauth.c
index dd267ef7..fa4aa59e 100644
--- a/libshouldbeinlibc/exec-reauth.c
+++ b/libshouldbeinlibc/exec-reauth.c
@@ -41,7 +41,7 @@ exec_reauth (auth_t auth, int secure, int must_reauth,
 	     mach_port_t *ports, unsigned num_ports,
 	     mach_port_t *fds, unsigned num_fds)
 {
-  int i;
+  unsigned int i;
   error_t err = 0;
 
   error_t reauth (mach_port_t *port, int isproc)
diff --git a/libshouldbeinlibc/idvec-impgids.c b/libshouldbeinlibc/idvec-impgids.c
index 66f82e21..74d3cc12 100644
--- a/libshouldbeinlibc/idvec-impgids.c
+++ b/libshouldbeinlibc/idvec-impgids.c
@@ -115,7 +115,7 @@ _merge_implied_gids (struct idvec *implied_gids, uid_t uid)
 error_t
 idvec_merge_implied_gids (struct idvec *gids, const struct idvec *uids)
 {
-  int i;
+  unsigned int i;
   error_t err = 0;
   for (i = 0; i < uids->num; i++)
     {
diff --git a/libshouldbeinlibc/idvec-rep.c b/libshouldbeinlibc/idvec-rep.c
index b20e58ca..16408a4d 100644
--- a/libshouldbeinlibc/idvec-rep.c
+++ b/libshouldbeinlibc/idvec-rep.c
@@ -87,7 +87,7 @@ idvec_rep (const struct idvec *idvec, int show_values, int show_names,
 
   if (idvec->num > 0)
     {
-      int i;
+      unsigned int i;
 
       for (i = 0; i < idvec->num; i++)
 	{
diff --git a/libshouldbeinlibc/idvec-verify.c b/libshouldbeinlibc/idvec-verify.c
index 981f86ac..4d9b6dbe 100644
--- a/libshouldbeinlibc/idvec-verify.c
+++ b/libshouldbeinlibc/idvec-verify.c
@@ -159,7 +159,7 @@ idvec_verify (const struct idvec *uids, const struct idvec *gids,
     return 0;
   else
     {
-      int i;
+      unsigned int i;
       int multiple = 0;		/* Asking for multiple ids? */
       error_t  err = 0;		/* Our return status.  */
       struct idvec implied_gids = IDVEC_INIT; /* Gids implied by uids.  */
diff --git a/libshouldbeinlibc/idvec.c b/libshouldbeinlibc/idvec.c
index 24adeb8f..d18871f9 100644
--- a/libshouldbeinlibc/idvec.c
+++ b/libshouldbeinlibc/idvec.c
@@ -184,7 +184,7 @@ idvec_merge_ids (struct idvec *idvec, const uid_t *ids, unsigned num)
   unsigned num_old = idvec->num;
   while (num-- > 0 && !err)
     {
-      int i;
+      unsigned int i;
       for (i = 0; i < num_old; i++)
 	if (idvec->ids[i] == *ids)
 	  break;
@@ -234,7 +234,7 @@ idvec_remove (struct idvec *idvec, unsigned pos, uid_t id)
 int
 idvec_subtract (struct idvec *idvec, const struct idvec *sub)
 {
-  int i;
+  unsigned int i;
   int done = 0;
   for (i = 0; i < sub->num; i++)
     done |= idvec_remove (idvec, 0, sub->ids[i]);
diff --git a/libshouldbeinlibc/portxlate.c b/libshouldbeinlibc/portxlate.c
index 291bcf3a..599fb584 100644
--- a/libshouldbeinlibc/portxlate.c
+++ b/libshouldbeinlibc/portxlate.c
@@ -54,7 +54,7 @@ port_name_xlator_create (mach_port_t from_task, mach_port_t to_task,
       x->ports = malloc (sizeof (mach_port_t) * x->to_names_len);
       if (x->ports)
 	{
-	  int i;
+	  unsigned int i;
 	  for (i = 0; i < x->to_names_len; i++)
 	    x->ports[i] = MACH_PORT_NULL;
 	}
@@ -80,7 +80,7 @@ port_name_xlator_create (mach_port_t from_task, mach_port_t to_task,
 void
 port_name_xlator_free (struct port_name_xlator *x)
 {
-  int i;
+  unsigned int i;
 
   for (i = 0; i < x->to_names_len; i++)
     if (x->ports[i] != MACH_PORT_NULL)
diff --git a/libshouldbeinlibc/timefmt.c b/libshouldbeinlibc/timefmt.c
index aa8965b7..7ce973bc 100644
--- a/libshouldbeinlibc/timefmt.c
+++ b/libshouldbeinlibc/timefmt.c
@@ -226,7 +226,7 @@ fmt_seconds (struct timeval *tv, int leading_zeros, int frac_places,
   p += add_field (&secs, MINUTE, &leading_zeros, 4, ":", width, p);
   p += add_field (&secs, SECOND, &leading_zeros, 1, "", width, p);
 
-  if (frac_places < 0 && (p - buf) < width - 2)
+  if (frac_places < 0 && (p - buf) < (int) width - 2)
     /* If FRAC_PLACES is < 0, then use any space remaining before WIDTH.  */
     frac_places = width - (p - buf) - 1;
 
diff --git a/libshouldbeinlibc/ugids-verify-auth.c b/libshouldbeinlibc/ugids-verify-auth.c
index 91fa06e9..28e3bdab 100644
--- a/libshouldbeinlibc/ugids-verify-auth.c
+++ b/libshouldbeinlibc/ugids-verify-auth.c
@@ -173,7 +173,7 @@ ugids_verify_make_auth (const struct ugids *ugids,
   if (verify_fn)
     /* Clean up any left over state.  */
     {
-      int i;
+      unsigned int i;
 
       /* Get rid of auth ports.  */
       for (i = 0; i < svma_state.num_auths; i++)