summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-07-26 16:01:32 +0200
committerWerner Koch <wk@gnupg.org>2010-07-26 16:01:32 +0200
commitca279dc707df0cdca43271ba02133327a138f625 (patch)
tree53cb5c3a804bb9c8ddffdc0a2bb0e3ecd8f22b40 /common
parentAdd new set_binary feature to estream (diff)
downloadgnupg2-ca279dc707df0cdca43271ba02133327a138f625.tar.xz
gnupg2-ca279dc707df0cdca43271ba02133327a138f625.zip
Some work on the dirmngr
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog4
-rw-r--r--common/argparse.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/common/ChangeLog b/common/ChangeLog
index aa597f135..a60cf1ea8 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-25 Werner Koch <wk@g10code.com>
+
+ * argparse.c (initialize): Use ARGPARSE_PRINT_WARNING constant.
+
2010-07-24 Werner Koch <wk@g10code.com>
* estream.c (es_set_binary): New.
diff --git a/common/argparse.c b/common/argparse.c
index aa7dc5b02..f6b599683 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -267,7 +267,7 @@ initialize( ARGPARSE_ARGS *arg, const char *filename, unsigned *lineno )
else
jnlib_log_error (_("invalid option \"%.50s\"\n"), s);
}
- if ( arg->err != 1 )
+ if (arg->err != ARGPARSE_PRINT_WARNING)
exit (2);
arg->err = 0;
}