security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpgscm: Fix error message.

Browse Source 
* tests/gpgscm/ffi.c (do_wait_processes): Fix and improve error
messages.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-11-08 14:47:43 +01:00
parent dd13b2a561
commit d4454837cd
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/gpgscm/ffi.c
View File

@ -48,6 +48,20 @@
#include "ffi.h" #include "ffi.h"
#include "ffi-private.h" #include "ffi-private.h"
/* For use in nice error messages. */
static const char *
ordinal_suffix (int n)
{
switch (n)
{
case 1: return "st";
case 2: return "nd";
case 3: return "rd";
default: return "th";
}
assert (! "reached");
}
int int
@ -827,17 +841,19 @@ do_wait_processes (scheme *sc, pointer args)
err = ffi_list2argv (sc, list_names, &names, &count); err = ffi_list2argv (sc, list_names, &names, &count);
if (err == gpg_error (GPG_ERR_INV_VALUE)) if (err == gpg_error (GPG_ERR_INV_VALUE))
return ffi_sprintf (sc, "%luth element of first argument is " return ffi_sprintf (sc, "%lu%s element of first argument is "
"neither string nor symbol", "neither string nor symbol",
(unsigned long) count); (unsigned long) count,
ordinal_suffix ((int) count));
if (err) if (err)
FFI_RETURN_ERR (sc, err); FFI_RETURN_ERR (sc, err);
err = ffi_list2intv (sc, list_pids, (int **) &pids, &count); err = ffi_list2intv (sc, list_pids, (int **) &pids, &count);
if (err == gpg_error (GPG_ERR_INV_VALUE)) if (err == gpg_error (GPG_ERR_INV_VALUE))
return ffi_sprintf (sc, "%luth element of second argument is " return ffi_sprintf (sc, "%lu%s element of second argument is "
"neither string nor symbol", "not a number",
(unsigned long) count); (unsigned long) count,
ordinal_suffix ((int) count));
if (err) if (err)
FFI_RETURN_ERR (sc, err); FFI_RETURN_ERR (sc, err);
@ -995,19 +1011,6 @@ do_file_equal (scheme *sc, pointer args)
goto out; goto out;
} }
static const char *
ordinal_suffix (int n)
{
switch (n)
{
case 1: return "st";
case 2: return "nd";
case 3: return "rd";
default: return "th";
}
assert (! "reached");
}
static pointer static pointer
do_splice (scheme *sc, pointer args) do_splice (scheme *sc, pointer args)
{ {