[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libidn branch, master, updated. libidn-1-16-5-g47e64c4
From: |
Simon Josefsson |
Subject: |
[SCM] GNU libidn branch, master, updated. libidn-1-16-5-g47e64c4 |
Date: |
Tue, 12 Jan 2010 13:39: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 libidn".
http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=47e64c4a7126b28e4e8c0c37dee2024a71e7e40c
The branch, master has been updated
via 47e64c4a7126b28e4e8c0c37dee2024a71e7e40c (commit)
via fbb1190dce137c8a514a6c3998265e2adc3e036e (commit)
via 5dea3524634622b25687acea6e20d4cca2700d58 (commit)
via 52e4518f773b422388c8f2598f376835b9c9de03 (commit)
from fcf59c249dd1b37b134c57fe8fca571cb62db329 (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 47e64c4a7126b28e4e8c0c37dee2024a71e7e40c
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 14:39:51 2010 +0100
Fix syntax-check rules.
commit fbb1190dce137c8a514a6c3998265e2adc3e036e
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 13:55:43 2010 +0100
Don't use exit(1).
commit 5dea3524634622b25687acea6e20d4cca2700d58
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 13:42:50 2010 +0100
Add.
commit 52e4518f773b422388c8f2598f376835b9c9de03
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 13:42:47 2010 +0100
Add.
-----------------------------------------------------------------------
Summary of changes:
.x-sc_avoid_if_before_free | 2 --
.x-sc_cast_of_alloca_return_value | 1 -
.x-sc_error_message_uppercase | 1 -
.x-sc_makefile_at_at_check | 2 ++
.x-sc_makefile_check | 3 ---
.x-sc_space_tab | 5 -----
cfg.mk | 1 +
doc/libidn.texi | 4 ++--
examples/example3.c | 4 ++--
examples/example4.c | 4 ++--
java/gnu/inet/encoding/NFKC.java | 20 ++++++++++----------
java/misc/GenerateNFKC.java | 6 +++---
lib/gl/striconv.c | 3 +--
maint.mk | 4 +++-
tests/utils.c | 4 ++--
15 files changed, 28 insertions(+), 36 deletions(-)
create mode 100644 .x-sc_makefile_at_at_check
diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free
index 22a2926..e69de29 100644
--- a/.x-sc_avoid_if_before_free
+++ b/.x-sc_avoid_if_before_free
@@ -1,2 +0,0 @@
-^lib/gl/striconv.c
-^build-aux/useless-if-before-free
diff --git a/.x-sc_cast_of_alloca_return_value
b/.x-sc_cast_of_alloca_return_value
index ceae7ca..e69de29 100644
--- a/.x-sc_cast_of_alloca_return_value
+++ b/.x-sc_cast_of_alloca_return_value
@@ -1 +0,0 @@
-^gl/error.c
diff --git a/.x-sc_error_message_uppercase b/.x-sc_error_message_uppercase
index 0b3c9e3..e69de29 100644
--- a/.x-sc_error_message_uppercase
+++ b/.x-sc_error_message_uppercase
@@ -1 +0,0 @@
-^gl/strerror.c
diff --git a/.x-sc_makefile_at_at_check b/.x-sc_makefile_at_at_check
new file mode 100644
index 0000000..64f5fe4
--- /dev/null
+++ b/.x-sc_makefile_at_at_check
@@ -0,0 +1,2 @@
+^lib/Makefile.am
+^src/Makefile.am
diff --git a/.x-sc_makefile_check b/.x-sc_makefile_check
index d7aeea0..64f5fe4 100644
--- a/.x-sc_makefile_check
+++ b/.x-sc_makefile_check
@@ -1,5 +1,2 @@
-^gl/Makefile.am
-^lib/gl/Makefile.am
-^lib/gltests/Makefile.am
^lib/Makefile.am
^src/Makefile.am
diff --git a/.x-sc_space_tab b/.x-sc_space_tab
index e92625d..2b897e4 100644
--- a/.x-sc_space_tab
+++ b/.x-sc_space_tab
@@ -1,6 +1 @@
-^java
^doc/specifications/
-^build-aux/csharpcomp.sh.in
-^gl/m4/gnulib-comp.m4
-^lib/gl/m4/lib-ld.m4
-^lib/gl/m4/lib-prefix.m4
diff --git a/cfg.mk b/cfg.mk
index d3a7974..a9a8980 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,6 +29,7 @@ local-checks-to-skip = sc_prohibit_strcmp
sc_prohibit_have_config_h \
sc_useless_cpp_parens sc_GPL_version sc_immutable_NEWS \
sc_two_space_separator_in_usage sc_m4_quote_check sc_po_check \
sc_copyright_check
+VC_LIST_NEVER = ^((lib/)?(gl|gltests|build-aux))/.*
doc/Makefile.gdoc:
printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > doc/Makefile.gdoc
diff --git a/doc/libidn.texi b/doc/libidn.texi
index 74ef17d..6ba126c 100644
--- a/doc/libidn.texi
+++ b/doc/libidn.texi
@@ -14,7 +14,7 @@
This manual is last updated @value{UPDATED} for version
@value{VERSION} of GNU Libidn.
-Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon
Josefsson.
+Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Simon Josefsson.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -768,7 +768,7 @@ following first in your @code{main}:
@{
printf ("stringprep_check_version() failed:\n"
"Header file incompatible with shared library.\n");
- exit(1);
+ exit(EXIT_FAILURE);
@}
@end example
diff --git a/examples/example3.c b/examples/example3.c
index 2342c7d..0cd43b3 100644
--- a/examples/example3.c
+++ b/examples/example3.c
@@ -1,5 +1,5 @@
/* example3.c --- Example ToASCII() code showing how to use Libidn.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
*
* This file is part of GNU Libidn.
*
@@ -62,7 +62,7 @@ main (void)
if (rc != IDNA_SUCCESS)
{
printf ("ToASCII() failed (%d): %s\n", rc, idna_strerror (rc));
- exit (1);
+ return EXIT_FAILURE;
}
printf ("ACE label (length %d): '%s'\n", strlen (p), p);
diff --git a/examples/example4.c b/examples/example4.c
index 20e5c88..629dcf5 100644
--- a/examples/example4.c
+++ b/examples/example4.c
@@ -1,5 +1,5 @@
/* example4.c --- Example ToUnicode() code showing how to use Libidn.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
*
* This file is part of GNU Libidn.
*
@@ -62,7 +62,7 @@ main (void)
if (rc != IDNA_SUCCESS)
{
printf ("ToUnicode() failed (%d): %s\n", rc, idna_strerror (rc));
- exit (1);
+ return EXIT_FAILURE;
}
printf ("ACE label (length %d): '%s'\n", strlen (p), p);
diff --git a/java/gnu/inet/encoding/NFKC.java b/java/gnu/inet/encoding/NFKC.java
index cd090bb..a42bd81 100644
--- a/java/gnu/inet/encoding/NFKC.java
+++ b/java/gnu/inet/encoding/NFKC.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
*
* Author: Oliver Hitz
*
@@ -68,16 +68,16 @@ public class NFKC
int cc = combiningClass(out.charAt(i));
if (i > 0 && (last_cc == 0 || last_cc != cc)) {
- // Try to combine characters
- char a = out.charAt(last_start);
- char b = out.charAt(i);
+ // Try to combine characters
+ char a = out.charAt(last_start);
+ char b = out.charAt(i);
- int c = compose(a, b);
+ int c = compose(a, b);
- if (c != -1) {
- out.setCharAt(last_start, (char) c);
- out.deleteCharAt(i);
- i--;
+ if (c != -1) {
+ out.setCharAt(last_start, (char) c);
+ out.deleteCharAt(i);
+ i--;
if (i == last_start) {
last_cc = 0;
@@ -89,7 +89,7 @@ public class NFKC
}
if (cc == 0) {
- last_start = i;
+ last_start = i;
}
last_cc = cc;
diff --git a/java/misc/GenerateNFKC.java b/java/misc/GenerateNFKC.java
index d4a5efa..7b7e2b6 100644
--- a/java/misc/GenerateNFKC.java
+++ b/java/misc/GenerateNFKC.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
*
* Author: Oliver Hitz
*
@@ -204,7 +204,7 @@ public class GenerateNFKC
String k = (String) i.next();
String v = (String) compatibility.get(k);
- String d = decompose(v, compatibility);
+ String d = decompose(v, compatibility);
if (!d.equals(v)) {
replaced = true;
compatibility.put(k, d);
@@ -532,7 +532,7 @@ public class GenerateNFKC
String[] v = ((String[]) singleSecondComposition.get(k));
w.println(" { '"+toJavaString(v[0])+"', '"+toJavaString(v[1])+"'
},");
- indices.put(new Integer(Integer.parseInt(k, 16)), new Integer(index));
+ indices.put(new Integer(Integer.parseInt(k, 16)), new Integer(index));
index++;
}
w.println(" };");
diff --git a/lib/gl/striconv.c b/lib/gl/striconv.c
index 1d83c4a..e8b4fb5 100644
--- a/lib/gl/striconv.c
+++ b/lib/gl/striconv.c
@@ -233,8 +233,7 @@ str_cd_iconv (const char *src, iconv_t cd)
(result != NULL ? realloc (result, length + 1) : malloc (length + 1));
if (final_result == NULL)
{
- if (result != NULL)
- free (result);
+ free (result);
errno = ENOMEM;
return NULL;
}
diff --git a/maint.mk b/maint.mk
index 3651543..c91b730 100644
--- a/maint.mk
+++ b/maint.mk
@@ -38,7 +38,9 @@ VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
VC_LIST_EXCEPT = \
$(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
- else grep -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi
+ else grep -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
+ | if test -n "$(VC_LIST_NEVER)"; then grep -Ev "$(VC_LIST_NEVER)"; \
+ else cat; fi
ifeq ($(origin prev_version_file), undefined)
prev_version_file = $(srcdir)/.prev-version
diff --git a/tests/utils.c b/tests/utils.c
index 78a009b..933f91e 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,5 +1,5 @@
/* utils.c --- Self test utilities.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
*
* This file is part of GNU Libidn.
*
@@ -41,7 +41,7 @@ fail (const char *format, ...)
va_end (arg_ptr);
error_count++;
if (break_on_error)
- exit (1);
+ exit (EXIT_FAILURE);
}
void
hooks/post-receive
--
GNU libidn
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU libidn branch, master, updated. libidn-1-16-5-g47e64c4,
Simon Josefsson <=