gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gsasl branch, saml, updated. gsasl-1-7-0-1-gd0d8c7b


From: Simon Josefsson
Subject: [SCM] GNU gsasl branch, saml, updated. gsasl-1-7-0-1-gd0d8c7b
Date: Sat, 13 Nov 2010 14:05:57 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=d0d8c7bef1d925df408e2bfc13e29ee1f5c78257

The branch, saml has been updated
       via  d0d8c7bef1d925df408e2bfc13e29ee1f5c78257 (commit)
      from  847347f6bf35e47039433a609f3de7a060364020 (commit)

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 d0d8c7bef1d925df408e2bfc13e29ee1f5c78257
Author: Simon Josefsson <address@hidden>
Date:   Sat Nov 13 15:06:16 2010 +0100

    Fix compiler warnings.

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

Summary of changes:
 src/gsasl.c            |    5 +++--
 tests/cram-md5.c       |    9 +++++----
 tests/digest-md5.c     |   42 ++++++++++++++++++++++++++----------------
 tests/errors.c         |    4 ++--
 tests/external.c       |   13 ++++++++-----
 tests/old-cram-md5.c   |    7 ++++---
 tests/old-digest-md5.c |    8 ++++----
 tests/old-md5file.c    |    5 +++--
 tests/old-simple.c     |    6 +++---
 tests/saml20.c         |    8 ++++----
 tests/scram.c          |   24 +++++++++++++++---------
 tests/simple.c         |   10 +++++-----
 tests/utils.c          |    4 ++--
 13 files changed, 84 insertions(+), 61 deletions(-)

diff --git a/src/gsasl.c b/src/gsasl.c
index 71e29e5..bcd4b16 100644
--- a/src/gsasl.c
+++ b/src/gsasl.c
@@ -569,7 +569,8 @@ main (int argc, char *argv[])
                   gnutls_strerror (res), err_pos);
        }
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr) sockfd);
+      gnutls_transport_set_ptr (session, (gnutls_transport_ptr)
+                               (unsigned long) sockfd);
 
       if (!starttls ())
        return 1;
@@ -847,7 +848,7 @@ main (int argc, char *argv[])
                  sockalloc = 0;
                  sockalloc1 = 1000;
 
-                 printf("%.*s", output_len, out);
+                 printf("%.*s", (int) output_len, out);
                  free (out);
                }
              /* If there was an error, quit.  */
diff --git a/tests/cram-md5.c b/tests/cram-md5.c
index ab27f1c..0abe6a4 100644
--- a/tests/cram-md5.c
+++ b/tests/cram-md5.c
@@ -116,7 +116,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s\n", s1len, s1);
+       printf ("S: %.*s\n", (int) s1len, s1);
 
       if (last_server_challenge)
        {
@@ -129,7 +129,7 @@ doit (void)
 
       last_server_challenge = malloc (s1len);
       if (!last_server_challenge)
-       fail ("malloc() failure (%d)\n", s1len);
+       fail ("malloc() failure (%lu)\n", (unsigned long) s1len);
       memcpy (last_server_challenge, s1, s1len);
       last_server_challenge_len = s1len;
 
@@ -142,7 +142,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s\n", s2len, s2);
+       printf ("C: %.*s\n", (int) s2len, s2);
 
       res = gsasl_step (server, s2, s2len, &s1, &s1len);
       gsasl_free (s2);
@@ -154,7 +154,8 @@ doit (void)
 
       if (s1len != 0)
        {
-         fail ("gsasl_step() failed, additional length=%d:\n", s1len);
+         fail ("gsasl_step() failed, additional length=%lu:\n",
+               (unsigned long) s1len);
          fail ("%s\n", s1);
          return;
        }
diff --git a/tests/digest-md5.c b/tests/digest-md5.c
index af8a26f..b83378b 100644
--- a/tests/digest-md5.c
+++ b/tests/digest-md5.c
@@ -215,7 +215,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Server starts... */
 
@@ -229,7 +230,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s [%c]\n", s2len, s2, res == GSASL_OK ? 'O' : 'N');
+       printf ("S: %.*s [%c]\n", (int) s2len,
+               s2, res == GSASL_OK ? 'O' : 'N');
 
       /* Client responds... */
 
@@ -243,7 +245,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Server finishes... */
 
@@ -257,7 +260,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s [%c]\n", s2len, s2, res == GSASL_OK ? 'O' : 'N');
+       printf ("S: %.*s [%c]\n", (int) s2len,
+               s2, res == GSASL_OK ? 'O' : 'N');
 
       /* Client finishes. */
 
@@ -272,13 +276,15 @@ doit (void)
 
       if (s1len != 0)
        {
-         fail ("gsasl_step() failed, additional length=%d:\n", s1len);
+         fail ("gsasl_step() failed, additional length=%lu:\n",
+               (unsigned long) s1len);
          fail ("%s\n", s1);
          return;
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Server is done. */
 
@@ -335,7 +341,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("S: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Client respond... */
 
@@ -349,7 +356,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s2len, s2, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s2len,
+               s2, res == GSASL_OK ? 'O' : 'N');
 
       /* Server finishes... */
 
@@ -363,7 +371,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("S: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Client finishes... */
 
@@ -377,7 +386,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s2len, s2, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s2len,
+               s2, res == GSASL_OK ? 'O' : 'N');
 
       /* Server is done. */
 
@@ -414,7 +424,7 @@ doit (void)
       if (debug)
        {
          if (s1len == 3 && memcmp (s1, "foo", 3) == 0)
-           printf ("C: %.*s\n", s1len, s1);
+           printf ("C: %.*s\n", (int) s1len, s1);
          else
            {
              char *out;
@@ -428,7 +438,7 @@ doit (void)
                  return;
                }
 
-             printf ("C: %.*s\n", outlen, out);
+             printf ("C: %.*s\n", (int) outlen, out);
              free (out);
            }
        }
@@ -445,7 +455,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s\n", s2len, s2);
+       printf ("S: %.*s\n", (int) s2len, s2);
 
       free (s2);
 
@@ -462,7 +472,7 @@ doit (void)
       if (debug)
        {
          if (s1len == 3 && memcmp (s1, "bar", 3) == 0)
-           printf ("S: %.*s\n", s1len, s1);
+           printf ("S: %.*s\n", (int) s1len, s1);
          else
            {
              char *out;
@@ -476,7 +486,7 @@ doit (void)
                  return;
                }
 
-             printf ("S: %.*s\n", outlen, out);
+             printf ("S: %.*s\n", (int) outlen, out);
              free (out);
            }
        }
@@ -493,7 +503,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s\n", s2len, s2);
+       printf ("C: %.*s\n", (int) s2len, s2);
 
       free (s2);
 
diff --git a/tests/errors.c b/tests/errors.c
index a8231ec..0224411 100644
--- a/tests/errors.c
+++ b/tests/errors.c
@@ -1,5 +1,5 @@
 /* errors.c --- Test the gsasl_strerror and gsasl_strerror_name functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
  *
  * This file is part of GNU SASL.
  *
@@ -34,7 +34,7 @@ main (void)
 {
   const char *this = NULL, *last = NULL;
   const char *name;
-  size_t i = 0;
+  int i = 0;
 
   do {
     last = this;
diff --git a/tests/external.c b/tests/external.c
index b711247..530a6ef 100644
--- a/tests/external.c
+++ b/tests/external.c
@@ -1,5 +1,5 @@
 /* external.c --- Test the EXTERNAL mechanism.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
  *
  * This file is part of GNU SASL.
  *
@@ -87,7 +87,7 @@ doit (void)
   Gsasl_session *server = NULL, *client = NULL;
   char *s1, *s2;
   size_t s1len, s2len;
-  size_t i;
+  int i;
   int res;
 
   res = gsasl_init (&ctx);
@@ -134,7 +134,8 @@ doit (void)
       if (debug)
        {
          if (s1)
-           printf ("S[%d]: `%.*s' (%d)\n", i, s1len, s1, s1len);
+           printf ("S[%d]: `%.*s' (%lu)\n", i, (int) s1len, s1,
+                   (unsigned long) s1len);
          else
            printf ("S[%d] NULL\n", i);
        }
@@ -151,7 +152,8 @@ doit (void)
       if (debug)
        {
          if (s2)
-           printf ("C[%d]: `%.*s' (%d)\n", i, s2len, s2, s2len);
+           printf ("C[%d]: `%.*s' (%lu)\n", i, (int) s2len, s2,
+                   (unsigned long) s2len);
          else
            printf ("C[%d] NULL\n", i);
        }
@@ -167,7 +169,8 @@ doit (void)
 
       if (s1len != 0)
        {
-         fail ("gsasl_step() failed, additional length=%d:\n%s", s1len, s1);
+         fail ("gsasl_step() failed, additional length=%lu:\n%s",
+               (unsigned long) s1len, s1);
          return;
        }
 
diff --git a/tests/old-cram-md5.c b/tests/old-cram-md5.c
index f9df9f1..ff5fc10 100644
--- a/tests/old-cram-md5.c
+++ b/tests/old-cram-md5.c
@@ -140,7 +140,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s\n", s1len, s1);
+       printf ("S: %.*s\n", (int) s1len, s1);
 
       res = gsasl_step (client, s1, s1len, &s2, &s2len);
       free (s1);
@@ -151,7 +151,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s\n", s2len, s2);
+       printf ("C: %.*s\n", (int) s2len, s2);
 
       res = gsasl_step (server, s2, s2len, &s1, &s1len);
       free (s2);
@@ -163,7 +163,8 @@ doit (void)
 
       if (s1len != 0)
        {
-         fail ("gsasl_step() failed, additional length=%d:\n", s1len);
+         fail ("gsasl_step() failed, additional length=%lu:\n",
+               (unsigned long) s1len);
          fail ("%s\n", s1);
          return;
        }
diff --git a/tests/old-digest-md5.c b/tests/old-digest-md5.c
index b27a02c..b893dcd 100644
--- a/tests/old-digest-md5.c
+++ b/tests/old-digest-md5.c
@@ -182,7 +182,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s\n", s1len, s1);
+       printf ("S: %.*s\n", (int) s1len, s1);
 
       /* Client respond... */
 
@@ -196,7 +196,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s\n", s2len, s2);
+       printf ("C: %.*s\n", (int) s2len, s2);
 
       /* Server finishes... */
 
@@ -210,7 +210,7 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s\n", s1len, s1);
+       printf ("S: %.*s\n", (int) s1len, s1);
 
       /* Client finishes... */
 
@@ -228,7 +228,7 @@ doit (void)
          /* Solaris x86 crashes here if s2 is NULL, even when s2len
             is 0. */
          if (s2len)
-           printf ("C: %.*s\n", s2len, s2);
+           printf ("C: %.*s\n", (int) s2len, s2);
          else
            printf ("C: \n");
        }
diff --git a/tests/old-md5file.c b/tests/old-md5file.c
index 5d794ee..a9c99a5 100644
--- a/tests/old-md5file.c
+++ b/tests/old-md5file.c
@@ -1,5 +1,5 @@
 /* md5file.c --- Test the MD5 file password function.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Simon 
Josefsson
  *
  * This file is part of GNU SASL.
  *
@@ -68,7 +68,8 @@ doit (void)
     fail ("user-found FAIL (%d): %s\n", res, gsasl_strerror (res));
   if (keylen != strlen (BILL_PASSWD)
       || memcmp (key, BILL_PASSWD, keylen) != 0)
-    fail ("user-password FAIL (%d): %.*s\n", keylen, keylen, key);
+    fail ("user-password FAIL (%lu): %.*s\n",
+         (unsigned long) keylen, (int) keylen, key);
   else
     success ("user-password OK\n");
 
diff --git a/tests/old-simple.c b/tests/old-simple.c
index ce2f574..2331ea3 100644
--- a/tests/old-simple.c
+++ b/tests/old-simple.c
@@ -397,7 +397,7 @@ doit (void)
   Gsasl_session_ctx *xctx = NULL;
   char output[MAX_LINE_LENGTH];
   size_t outputlen;
-  size_t i, j;
+  int i, j;
   int res;
 
   if (!gsasl_check_version (GSASL_VERSION))
@@ -501,7 +501,7 @@ doit (void)
              fail
                ("SASL entry %d mechanism %s client step %d length error\n",
                 i, sasltv[i].mech, j);
-             j = (size_t) -1;
+             j = -1;
              break;
            }
 
@@ -512,7 +512,7 @@ doit (void)
                      sasltv[i].step[j + 1] : "");
              fail ("SASL entry %d mechanism %s client step %d data error\n",
                    i, sasltv[i].mech, j);
-             j = (size_t) -1;
+             j = -1;
              break;
            }
 
diff --git a/tests/saml20.c b/tests/saml20.c
index 0222783..7fb44dc 100644
--- a/tests/saml20.c
+++ b/tests/saml20.c
@@ -185,7 +185,7 @@ doit (void)
     }
 
   if (debug)
-    printf ("C: `%s' (%d)\n", s1 ? s1 : "", strlen (s1));
+    printf ("C: `%s' (%lu)\n", s1 ? s1 : "", (unsigned long) strlen (s1));
 
   res = gsasl_step64 (server, s1, &s2);
   gsasl_free (s1);
@@ -196,7 +196,7 @@ doit (void)
     }
 
   if (debug)
-    printf ("S: `%s' (%d)\n", s2 ? s2 : "", strlen (s2));
+    printf ("S: `%s' (%lu)\n", s2 ? s2 : "", (unsigned long) strlen (s2));
 
   res = gsasl_step64 (client, s2, &s1);
   gsasl_free (s2);
@@ -207,7 +207,7 @@ doit (void)
     }
 
   if (debug)
-    printf ("C: `%s' (%d)\n", s1 ? s1 : "", strlen (s1));
+    printf ("C: `%s' (%lu)\n", s1 ? s1 : "", (unsigned long) strlen (s1));
 
   res = gsasl_step64 (server, s1, &s2);
   gsasl_free (s1);
@@ -218,7 +218,7 @@ doit (void)
     }
 
   if (debug)
-    printf ("S: `%s' (%d)\n", s2 ? s2 : "", strlen (s2));
+    printf ("S: `%s' (%lu)\n", s2 ? s2 : "", (unsigned long) strlen (s2));
 
   gsasl_free (s2);
 
diff --git a/tests/scram.c b/tests/scram.c
index 7e44393..984b6a6 100644
--- a/tests/scram.c
+++ b/tests/scram.c
@@ -44,7 +44,7 @@ static const char *AUTHZID[N_AUTHZID] = {
   "jas", "BAB,ABA", ",=,=", "="
 };
 
-size_t i;
+int i;
 
 static int
 callback (Gsasl * ctx, Gsasl_session * sctx, Gsasl_property prop)
@@ -177,7 +177,8 @@ doit (void)
            fail ("dummy initial server step produced output?!\n");
 
          if (debug)
-           printf ("S: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+           printf ("S: %.*s [%c]\n", (int) s1len,
+                   s1, res == GSASL_OK ? 'O' : 'N');
        }
       else
        {
@@ -219,7 +220,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Server first... */
 
@@ -233,7 +235,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s [%c]\n", s2len, s2, res == GSASL_OK ? 'O' : 'N');
+       printf ("S: %.*s [%c]\n", (int) s2len,
+               s2, res == GSASL_OK ? 'O' : 'N');
 
       /* Client final... */
 
@@ -253,7 +256,8 @@ doit (void)
        {
          char *s;
 
-         asprintf (&s, "%.*s,a=b,%s", s1len - 31, s1, s1 + s1len - 31 + 1);
+         asprintf (&s, "%.*s,a=b,%s", (int) (s1len - 31),
+                   s1, s1 + s1len - 31 + 1);
          gsasl_free (s1);
          s1 = s;
          s1len = strlen (s);
@@ -263,15 +267,16 @@ doit (void)
        {
          char *s;
 
-         asprintf (&s, "%.*s,a=b,b=c,c=d,%s", s1len - 31, s1,
-                   s1 + s1len - 31 + 1);
+         asprintf (&s, "%.*s,a=b,b=c,c=d,%s", (int) (s1len - 31),
+                   s1, s1 + s1len - 31 + 1);
          gsasl_free (s1);
          s1 = s;
          s1len = strlen (s);
        }
 
       if (debug)
-       printf ("C: %.*s [%c]\n", s1len, s1, res == GSASL_OK ? 'O' : 'N');
+       printf ("C: %.*s [%c]\n", (int) s1len,
+               s1, res == GSASL_OK ? 'O' : 'N');
 
       /* Server final... */
 
@@ -296,7 +301,8 @@ doit (void)
        }
 
       if (debug)
-       printf ("S: %.*s [%c]\n", s2len, s2, res == GSASL_OK ? 'O' : 'N');
+       printf ("S: %.*s [%c]\n", (int) s2len,
+               s2, res == GSASL_OK ? 'O' : 'N');
 
       /* Let client parse server final... */
 
diff --git a/tests/simple.c b/tests/simple.c
index 91fc2d8..a0bddf0 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -270,7 +270,7 @@ doit (void)
   Gsasl *ctx = NULL;
   Gsasl_session *sctx = NULL;
   char *out = NULL;
-  size_t i, j;
+  int i, j;
   int res;
 
   if (!gsasl_check_version (GSASL_VERSION))
@@ -356,7 +356,7 @@ doit (void)
              fail
                ("SASL entry %d mechanism %s client step %d length error\n",
                 i, sasltv[i].mech, j);
-             j = (size_t) -1;
+             j = -1;
              break;
            }
 
@@ -367,7 +367,7 @@ doit (void)
                      sasltv[i].step[j + 1] : "");
              fail ("SASL entry %d mechanism %s client step %d data error\n",
                    i, sasltv[i].mech, j);
-             j = (size_t) -1;
+             j = -1;
              break;
            }
 
@@ -397,14 +397,14 @@ doit (void)
        if (res != GSASL_OK)
          fail ("gsasl_encode %d: %s\n", res, gsasl_strerror (res));
        if (outlen != 3 && memcmp (out, "foo", outlen) != 0)
-         fail ("gsasl_encode memcmp: %.*s\n", outlen, out);
+         fail ("gsasl_encode memcmp: %.*s\n", (int) outlen, out);
        gsasl_free (out); out = NULL;
 
        res = gsasl_decode (sctx, "foo", 3, &out, &outlen);
        if (res != GSASL_OK)
          fail ("gsasl_decode %d: %s\n", res, gsasl_strerror (res));
        if (outlen != 3 && memcmp (out, "foo", outlen) != 0)
-         fail ("gsasl_decode memcmp: %.*s\n", outlen, out);
+         fail ("gsasl_decode memcmp: %.*s\n", (int) outlen, out);
        gsasl_free (out); out = NULL;
       }
 
diff --git a/tests/utils.c b/tests/utils.c
index 1bcd34c..ce59a22 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,5 +1,5 @@
 /* utils.c --- Self test utilities.
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009  Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2010  Simon Josefsson
  *
  * This file is part of GNU SASL.
  *
@@ -60,7 +60,7 @@ escapeprint (const char *str, size_t len)
 {
   size_t i;
 
-  printf (" (length %d bytes):\n\t", len);
+  printf (" (length %lu bytes):\n\t", (unsigned long) len);
   for (i = 0; i < len; i++)
     {
       if (((str[i] & 0xFF) >= 'A' && (str[i] & 0xFF) <= 'Z') ||


hooks/post-receive
-- 
GNU gsasl



reply via email to

[Prev in Thread] Current Thread [Next in Thread]