[SCM] GNU shishi branch, master, updated. shishi-1-0-2-17-gf74ed27

[Mats Erik Andersson]

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 shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=f74ed271c56ed05cba821043db4a5b08262808fc

The branch, master has been updated
       via  f74ed271c56ed05cba821043db4a5b08262808fc (commit)
      from  c11ad1da65c6dc131b19168e2b8f4f8dfaba57c3 (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 f74ed271c56ed05cba821043db4a5b08262808fc
Author: Mats Erik Andersson <address@hidden>
Date:   Wed May 22 00:29:39 2013 +0200

    More formatting of size_t.
    
    Replace format directive "%ld" by "%zu" for size_t.
    Uncovered on 32-bit systems.

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

Summary of changes:
 lib/authenticator.c |    8 ++++----
 lib/diskio.c        |   24 ++++++++++++------------
 lib/kdc.c           |   24 ++++++++++++------------
 lib/krberror.c      |    2 +-
 lib/principal.c     |    2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/authenticator.c b/lib/authenticator.c
index c068da2..4d8b9ff 100644
--- a/lib/authenticator.c
+++ b/lib/authenticator.c
@@ -803,7 +803,7 @@ shishi_authenticator_add_authorizationdata (Shishi * handle,
   if (res != SHISHI_OK)
     return res;
 
-  asprintf (&format, "authorization-data.?%ld.ad-type", i);
+  asprintf (&format, "authorization-data.?%zu.ad-type", i);
   res = shishi_asn1_write_integer (handle, authenticator, format, adtype);
   if (res != SHISHI_OK)
     {
@@ -811,7 +811,7 @@ shishi_authenticator_add_authorizationdata (Shishi * handle,
       return res;
     }
 
-  sprintf (format, "authorization-data.?%ld.ad-data", i);
+  sprintf (format, "authorization-data.?%zu.ad-data", i);
   res = shishi_asn1_write (handle, authenticator, format, addata, addatalen);
   free (format);
   if (res != SHISHI_OK)
@@ -853,13 +853,13 @@ shishi_authenticator_authorizationdata (Shishi * handle,
   if (nth > i)
     return SHISHI_OUT_OF_RANGE;
 
-  asprintf (&format, "authorization-data.?%ld.ad-type", nth);
+  asprintf (&format, "authorization-data.?%zu.ad-type", nth);
   res = shishi_asn1_read_int32 (handle, authenticator, format, adtype);
   free (format);
   if (res != SHISHI_OK)
     return res;
 
-  asprintf (&format, "authorization-data.?%ld.ad-data", i);
+  asprintf (&format, "authorization-data.?%zu.ad-data", i);
   res = shishi_asn1_read (handle, authenticator, format, addata, addatalen);
   free (format);
   if (res != SHISHI_OK)
diff --git a/lib/diskio.c b/lib/diskio.c
index 3d31d46..3818f77 100644
--- a/lib/diskio.c
+++ b/lib/diskio.c
@@ -305,7 +305,7 @@ _shishi_ticket_input (Shishi * handle,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -362,7 +362,7 @@ _shishi_enckdcreppart_input (Shishi * handle,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -441,7 +441,7 @@ _shishi_kdcreq_input (Shishi * handle, FILE * fh, 
Shishi_asn1 * asreq,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -504,7 +504,7 @@ _shishi_kdcrep_input (Shishi * handle, FILE * fh, 
Shishi_asn1 * asrep,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -566,7 +566,7 @@ _shishi_apreq_input (Shishi * handle, FILE * fh, 
Shishi_asn1 * apreq,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -615,7 +615,7 @@ _shishi_aprep_input (Shishi * handle, FILE * fh, 
Shishi_asn1 * aprep,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -666,7 +666,7 @@ _shishi_encapreppart_input (Shishi * handle, FILE * fh,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -716,7 +716,7 @@ _shishi_authenticator_input (Shishi * handle,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -766,7 +766,7 @@ _shishi_krberror_input (Shishi * handle,
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -815,7 +815,7 @@ _shishi_safe_input (Shishi * handle, FILE * fh, Shishi_asn1 
* safe, int type)
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -864,7 +864,7 @@ _shishi_priv_input (Shishi * handle, FILE * fh, Shishi_asn1 
* priv, int type)
       if (derlen <= 0 || !feof (fh) || ferror (fh))
        {
          shishi_error_printf (handle,
-                              "Error reading from file (got %ld bytes)...",
+                              "Error reading from file (got %zu bytes)...",
                               derlen);
          return !SHISHI_OK;
        }
@@ -908,7 +908,7 @@ shishi_key_parse (Shishi * handle, FILE * fh, Shishi_key ** 
key)
        }
       line[strlen (line) - 1] = '\0';
       if (VERBOSENOISE (handle))
-       printf ("line %d read %ld bytes: %s\n", lno, strlen (line), line);
+       printf ("line %d read %zu bytes: %s\n", lno, strlen (line), line);
 
       if (!in_key)
        {
diff --git a/lib/kdc.c b/lib/kdc.c
index 311f304..01332eb 100644
--- a/lib/kdc.c
+++ b/lib/kdc.c
@@ -57,7 +57,7 @@ shishi_as_derive_salt (Shishi * handle,
     {
       int patype;
 
-      asprintf (&format, "padata.?%ld.padata-type", i);
+      asprintf (&format, "padata.?%zu.padata-type", i);
       res = shishi_asn1_read_int32 (handle, asrep, format, &patype);
       free (format);
       if (res != SHISHI_OK)
@@ -65,7 +65,7 @@ shishi_as_derive_salt (Shishi * handle,
 
       if (patype == SHISHI_PA_PW_SALT)
        {
-         asprintf (&format, "padata.?%ld.padata-value", i);
+         asprintf (&format, "padata.?%zu.padata-value", i);
          res = shishi_asn1_read (handle, asrep, format, salt, saltlen);
          free (format);
          if (res != SHISHI_OK)
@@ -89,7 +89,7 @@ shishi_as_derive_salt (Shishi * handle,
       char *tmp;
       size_t tmplen;
 
-      asprintf (&format, "req-body.cname.name-string.?%ld", i);
+      asprintf (&format, "req-body.cname.name-string.?%zu", i);
       res = shishi_asn1_read (handle, asreq, format, &tmp, &tmplen);
       free (format);
       if (res != SHISHI_OK)
@@ -165,7 +165,7 @@ shishi_kdcreq_sendrecv_hint (Shishi * handle,
   free (der);
 
   if (VERBOSEASN1 (handle))
-    printf ("received %ld bytes\n", buflen);
+    printf ("received %zu bytes\n", buflen);
 
   *kdcrep = shishi_der2asn1_asrep (handle, buffer, buflen);
   if (*kdcrep == NULL)
@@ -352,13 +352,13 @@ shishi_kdc_copy_cname (Shishi * handle,
       if (res != SHISHI_OK)
        return res;
 
-      asprintf (&format, "cname.name-string.?%ld", i);
+      asprintf (&format, "cname.name-string.?%zu", i);
       res = shishi_asn1_read (handle, encticketpart, format, &buf, &buflen);
       free (format);
       if (res != SHISHI_OK)
        return res;
 
-      asprintf (&format, "cname.name-string.?%ld", i);
+      asprintf (&format, "cname.name-string.?%zu", i);
       res = shishi_asn1_write (handle, kdcrep, format, buf, buflen);
       free (format);
       free (buf);
@@ -407,13 +407,13 @@ shishi_as_check_cname (Shishi * handle, Shishi_asn1 
asreq, Shishi_asn1 asrep)
 
   for (i = 1; i <= j; i++)
     {
-      asprintf (&format, "req-body.cname.name-string.?%ld", i);
+      asprintf (&format, "req-body.cname.name-string.?%zu", i);
       res = shishi_asn1_read (handle, asreq, format, &reqcname, &reqcnamelen);
       free (format);
       if (res != SHISHI_OK)
        return res;
 
-      asprintf (&format, "cname.name-string.?%ld", i);
+      asprintf (&format, "cname.name-string.?%zu", i);
       res = shishi_asn1_read (handle, asrep, format, &repcname, &repcnamelen);
       free (format);
       if (res != SHISHI_OK)
@@ -423,8 +423,8 @@ shishi_as_check_cname (Shishi * handle, Shishi_asn1 asreq, 
Shishi_asn1 asrep)
        {
          reqcname[reqcnamelen] = '\0';
          repcname[repcnamelen] = '\0';
-         printf ("request cname %ld: %s\n", i, reqcname);
-         printf ("reply cname %ld: %s\n", i, repcname);
+         printf ("request cname %zu: %s\n", i, reqcname);
+         printf ("reply cname %zu: %s\n", i, repcname);
        }
 
       res = (reqcnamelen != repcnamelen) ||
@@ -477,11 +477,11 @@ shishi_kdc_check_nonce_1 (Shishi * handle,
     {
       size_t i;
 
-      printf ("request nonce (len=%ld) ", reqnoncelen);
+      printf ("request nonce (len=%zu) ", reqnoncelen);
       for (i = 0; i < reqnoncelen; i++)
        printf ("%02x", reqnonce[i] & 0xFF);
       printf ("\n");
-      printf ("reply nonce (len=%ld) ", repnoncelen);
+      printf ("reply nonce (len=%zu) ", repnoncelen);
       for (i = 0; i < repnoncelen; i++)
        printf ("%02x", repnonce[i] & 0xFF);
       printf ("\n");
diff --git a/lib/krberror.c b/lib/krberror.c
index 463ee72..b44a4ac 100644
--- a/lib/krberror.c
+++ b/lib/krberror.c
@@ -1222,7 +1222,7 @@ shishi_krberror_pretty_print (Shishi * handle, FILE * fh,
 
              for (i = 1; i <= n; i++)
                {
-                 char *format = xasprintf ("?%ld.padata-type", i);
+                 char *format = xasprintf ("?%zu.padata-type", i);
                  int32_t padatatype;
 
                  if (i > 1)
diff --git a/lib/principal.c b/lib/principal.c
index 80823cd..c52de4e 100644
--- a/lib/principal.c
+++ b/lib/principal.c
@@ -211,7 +211,7 @@ shishi_principal_name (Shishi * handle,
       size_t tmplen;
       size_t safetmplen;
 
-      asprintf (&format, "%s.name-string.?%ld", namefield, i);
+      asprintf (&format, "%s.name-string.?%zu", namefield, i);
       res = shishi_asn1_read (handle, namenode, format, &tmp, &tmplen);
       free (format);
       if (res != SHISHI_OK)


hooks/post-receive
-- 
GNU shishi