aboutsummaryrefslogtreecommitdiffstats
path: root/jnlib
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-02-22 18:08:28 +0000
committerWerner Koch <[email protected]>2005-02-22 18:08:28 +0000
commitcf8f6d3cefd3ed45bac7f944c03319746277c292 (patch)
treedc398307a31b09a7cde1381be33ca193ce8a0457 /jnlib
parentRenmoved stale file (diff)
downloadgnupg-cf8f6d3cefd3ed45bac7f944c03319746277c292.tar.gz
gnupg-cf8f6d3cefd3ed45bac7f944c03319746277c292.zip
(stream_read_string): Removed call to abort on
memory error because the CVS version of libgcrypt makes sure that ERRNO gets always set on error even with a faulty user supplied function.
Diffstat (limited to 'jnlib')
-rw-r--r--jnlib/ChangeLog3
-rw-r--r--jnlib/argparse.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 0c82c8724..f308a7ea3 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -316,7 +316,8 @@ Mon Jan 24 13:04:28 CET 2000 Werner Koch <[email protected]>
* You may find it source-copied in other packages. *
***********************************************************
- Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright 2000, 2001, 2002, 2003, 2004,
+ 2005 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index de828e8ce..485c60786 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -904,7 +904,7 @@ strusage( int level )
switch( level ) {
case 11: p = "foo"; break;
case 13: p = "0.0"; break;
- case 14: p = "Copyright (C) 2004 Free Software Foundation, Inc."; break;
+ case 14: p = "Copyright (C) 2005 Free Software Foundation, Inc."; break;
case 15: p =
"This program comes with ABSOLUTELY NO WARRANTY.\n"
"This is free software, and you are welcome to redistribute it\n"