[SCM] GNU libidn branch, master, updated. libidn-1-21-13-gfc88e80

[Simon Josefsson]

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

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=fc88e8024de9c5dee992fabd1316124b2a4e5d02

The branch, master has been updated
       via  fc88e8024de9c5dee992fabd1316124b2a4e5d02 (commit)
       via  4a6756337bad5f7e0e3da80587b0248d86a0b710 (commit)
       via  c44b1d7ae5949f544841de43aefdc1ba0d131058 (commit)
       via  00abe824ec272c7cd00a0371317499195f79bde4 (commit)
      from  7649dc2bb9598e2909692d648de85282fb0c1ddb (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 fc88e8024de9c5dee992fabd1316124b2a4e5d02
Author: Simon Josefsson <address@hidden>
Date:   Wed May 4 20:40:02 2011 +0200

    Generated.

commit 4a6756337bad5f7e0e3da80587b0248d86a0b710
Author: Simon Josefsson <address@hidden>
Date:   Wed May 4 20:35:32 2011 +0200

    Version 1.22.

commit c44b1d7ae5949f544841de43aefdc1ba0d131058
Author: Simon Josefsson <address@hidden>
Date:   Wed May 4 20:25:29 2011 +0200

    dev: Ran clang-analyze on the code.
    
    Fixed some dead assignments/initializations.

commit 00abe824ec272c7cd00a0371317499195f79bde4
Author: Simon Josefsson <address@hidden>
Date:   Wed May 4 19:42:55 2011 +0200

    Doc fix.

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

Summary of changes:
 ChangeLog  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS       |    7 +++++--
 cfg.mk     |   14 ++++++++++++++
 lib/idna.c |   11 +++++------
 lib/nfkc.c |    7 ++-----
 5 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31f610d..69ef23d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2011-05-04  Simon Josefsson <address@hidden>
+
+       * NEWS: Version 1.22.
+
+2011-05-04  Simon Josefsson <address@hidden>
+
+       * NEWS, cfg.mk, lib/idna.c, lib/nfkc.c: dev: Ran clang-analyze on
+       the code.  Fixed some dead assignments/initializations.
+
+2011-05-04  Simon Josefsson <address@hidden>
+
+       * NEWS: Doc fix.
+
+2011-05-03  Simon Josefsson <address@hidden>
+
+       * .gitignore, NEWS, THANKS, lib/idna.c, lib/stringprep.h,
+       tests/Makefile.am, tests/tst_idna4.c: libidn: Fix memory leak when
+       idna_to_ascii_4i fails.  Reported by and tiny patch from Olga Limburg 
<address@hidden>.
+
+2011-05-03  Simon Josefsson <address@hidden>
+
+       * build-aux/vc-list-files, cfg.mk, gl/m4/dup2.m4,
+       gl/m4/gnulib-comp.m4, gl/m4/manywarnings.m4, gl/m4/stdio_h.m4,
+       gltests/stdlib.in.h, lib/gl/m4/gnulib-comp.m4,
+       lib/gltests/stdlib.in.h, maint.mk: Update gnulib files.
+
+2011-05-01  Simon Josefsson <address@hidden>
+
+       * cfg.mk: Improve coverage rule names.  Drop mingw rules (see
+       win32/libidn4win.mk).
+
+2011-04-28  Simon Josefsson <address@hidden>
+
+       * NEWS, THANKS, libidn.pc.in: libidn: Add -liconv as static library
+       requirement in libidn.pc, for MinGW.  Reported by Volker Grabsch 
<address@hidden>.
+
+2011-04-25  Simon Josefsson <address@hidden>
+
+       * THANKS, doc/libidn.texi: Document --disable-valgrind-tests.  
Suggested by Guido Trentalancia <address@hidden>.
+
+2011-04-24  Simon Josefsson <address@hidden>
+
+       * doc/announce.txt: Update for 1.21.
+
+2011-04-24  Simon Josefsson <address@hidden>
+
+       * win32/libidn4win.mk: Fix.
+
+2011-04-24  Simon Josefsson <address@hidden>
+
+       * Makefile.am, NEWS: build: Really distribute win32/libidn4win.mk.
+
+2011-04-24  Simon Josefsson <address@hidden>
+
+       * NEWS, configure.ac: Bump version.
+
+2011-04-24  Simon Josefsson <address@hidden>
+
+       * ChangeLog: Generated.
+
 2011-04-24  Simon Josefsson <address@hidden>
 
        * NEWS: Version 1.21.
diff --git a/NEWS b/NEWS
index 75b1916..c9f1f17 100644
--- a/NEWS
+++ b/NEWS
@@ -2,14 +2,17 @@ Libidn NEWS -- History of user-visible changes.               
  -*- outline -*-
 Copyright (C) 2002-2011 Simon Josefsson
 See the end for copying conditions.
 
-* Version 1.22 (unreleased) [?]
+* Version 1.22 (released 2011-05-04) [stable]
 
 ** libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
 Reported by Volker Grabsch <address@hidden>.
 
-** libidn: Fix memory leak when idna_to_ascii_4i fails.
+** libidn: Fix memory leak in idna_to_ascii_4z when idna_to_ascii_4i fails.
 Reported by and tiny patch from Olga Limburg <address@hidden>.
 
+** libidn: Ran clang-analyze on the code.
+Fixed some dead assignments/initializations.
+
 ** build: Really distribute win32/libidn4win.mk.
 
 ** API and ABI is backwards compatible with the previous version.
diff --git a/cfg.mk b/cfg.mk
index f0d9c2e..22eeb16 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -69,6 +69,20 @@ coverage-web-upload:
        cd $(htmldir) && \
                cvs commit -m "Update." coverage
 
+# Clang analyzis.
+clang:
+       make clean
+       scan-build ./configure
+       rm -rf scan.tmp
+       scan-build -o scan.tmp make
+clang-web:
+       rm -fv `find $(htmldir)/clang-analyzer -type f | grep -v CVS`
+       cp -rv scan.tmp/*/* $(htmldir)/clang-analyzer/
+clang-web-upload:
+       cd $(htmldir) && \
+               cvs add clang-analyzer/*.html || true && \
+               cvs commit -m "Update." clang-analyzer
+
 # Release
 
 ChangeLog:
diff --git a/lib/idna.c b/lib/idna.c
index 906faa5..e875d3e 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -461,7 +461,7 @@ int
 idna_to_ascii_4z (const uint32_t * input, char **output, int flags)
 {
   const uint32_t *start = input;
-  const uint32_t *end = input;
+  const uint32_t *end;
   char buf[64];
   char *out = NULL;
   int rc;
@@ -624,12 +624,11 @@ int
 idna_to_unicode_4z4z (const uint32_t * input, uint32_t ** output, int flags)
 {
   const uint32_t *start = input;
-  const uint32_t *end = input;
+  const uint32_t *end;
   uint32_t *buf;
   size_t buflen;
   uint32_t *out = NULL;
   size_t outlen = 0;
-  int rc;
 
   *output = NULL;
 
@@ -645,9 +644,9 @@ idna_to_unicode_4z4z (const uint32_t * input, uint32_t ** 
output, int flags)
       if (!buf)
        return IDNA_MALLOC_ERROR;
 
-      rc = idna_to_unicode_44i (start, (size_t) (end - start),
-                               buf, &buflen, flags);
-      /* don't check rc as per specification! */
+      /* don't check return code as per specification! */
+      idna_to_unicode_44i (start, (size_t) (end - start),
+                          buf, &buflen, flags);
 
       if (out)
        {
diff --git a/lib/nfkc.c b/lib/nfkc.c
index d5ccf48..8f4c079 100644
--- a/lib/nfkc.c
+++ b/lib/nfkc.c
@@ -814,11 +814,8 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, 
GNormalizeMode mode)
     }
 
   if (n_wc > 0)
-    {
-      g_unicode_canonical_ordering (wc_buffer + last_start,
-                                   n_wc - last_start);
-      last_start = n_wc;
-    }
+    g_unicode_canonical_ordering (wc_buffer + last_start,
+                                 n_wc - last_start);
 
   wc_buffer[n_wc] = 0;
 


hooks/post-receive
-- 
GNU libidn