summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-08-23 15:46:50 +0200
committerWerner Koch <wk@gnupg.org>2011-08-23 15:46:50 +0200
commit27ffbcf63cf4e0cf87d0f4012735f709e215d5cb (patch)
tree5f8d4f50df6de37619e9caed4f16ee2b9f1f5697
parente6bda00b966010934150b0c2134b24ff07b7c9fc (diff)
downloadlibgpg-error-27ffbcf63cf4e0cf87d0f4012735f709e215d5cb.tar.gz
Add GPG_ERR_AMBIGUOUS
-rw-r--r--ChangeLog2
-rw-r--r--NEWS1
-rw-r--r--doc/errorref.txt5
-rw-r--r--src/err-codes.h.in5
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 887758e..ecf78dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
2011-08-23 Werner Koch <wk@g10code.com>
- * src/err-codes.h.in: Add GPG_ERR_DUP_KEY.
+ * src/err-codes.h.in: Add GPG_ERR_DUP_KEY and GPG_ERR_AMBIGUOUS.
2011-04-06 Werner Koch <wk@g10code.com>
diff --git a/NEWS b/NEWS
index 856fda0..6ca6e3f 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Noteworthy changes in version 1.11 (unreleased)
GPG_ERR_INV_CURVE NEW.
GPG_ERR_UNKNOWN_CURVE NEW.
GPG_ERR_DUP_KEY NEW.
+ GPG_ERR_AMBIGUOUS NEW.
Noteworthy changes in version 1.10 (2010-10-26)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index afabb0b..bbc9001 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -437,6 +437,11 @@ GPG_ERR_DUP_KEY Duplicated key
A duplicated key was detected. For example a unique key in a
database occurred more than once.
+GPG_ERR_AMBIGUOUS Ambiguous search
+
+ A search etc returned an ambigious result. This usually means
+ that the search string was not specific enough.
+
199 GPG_ERR_UNFINISHED Operation not yet finished
200 GPG_ERR_BUFFER_TOO_SHORT Buffer too short
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index e722688..dcef931 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -218,8 +218,9 @@
186 GPG_ERR_NO_KEYSERVER No keyserver available
187 GPG_ERR_INV_CURVE Invalid elliptic curve
188 GPG_ERR_UNKNOWN_CURVE Unknown elliptic curve
-189 GPG_ERR_DUP_KEY Duplicated key
-# 190 to 197 are free to be used.
+189 GPG_ERR_DUP_KEY Duplicated key
+190 GPG_ERR_AMBIGUOUS Ambiguous result
+# 191 to 197 are free to be used.
198 GPG_ERR_FULLY_CANCELED Operation fully cancelled
199 GPG_ERR_UNFINISHED Operation not yet finished