security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-31 11:41:32 +01:00
Code Activity

g10: Improve debugging output.

Browse Source 
* g10/tofu.c (string_to_long): Improve debugging output.
(string_to_ulong): Likewise.

Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-12-02 11:06:25 +01:00
parent bd1a1d8582
commit cd532bb7b8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
g10/tofu.c
View File

@ -410,9 +410,12 @@ string_to_long (long *r_value, const char *string, long fallback, int line)
if (errno || !(!strcmp (tail, ".0") || !*tail)) if (errno || !(!strcmp (tail, ".0") || !*tail))
{ {
err = errno? gpg_error_from_errno (errno) : gpg_error (GPG_ERR_BAD_DATA); err = errno? gpg_error_from_errno (errno) : gpg_error (GPG_ERR_BAD_DATA);
log_debug ("%s:%d: " log_debug ("%s:%d: strtol failed for TOFU DB data; returned string"
"strtol failed for DB returned string (tail=%.10s): %s\n", " (string='%.10s%s'; tail='%.10s%s'): %s\n",
__FILE__, line, tail, gpg_strerror (err)); __FILE__, line,
string, string && strlen(string) > 10 ? "..." : "",
tail, tail && strlen(tail) > 10 ? "..." : "",
gpg_strerror (err));
*r_value = fallback; *r_value = fallback;
} }
else else
@ -438,9 +441,12 @@ string_to_ulong (unsigned long *r_value, const char *string,
if (errno || !(!strcmp (tail, ".0") || !*tail)) if (errno || !(!strcmp (tail, ".0") || !*tail))
{ {
err = errno? gpg_error_from_errno (errno) : gpg_error (GPG_ERR_BAD_DATA); err = errno? gpg_error_from_errno (errno) : gpg_error (GPG_ERR_BAD_DATA);
log_debug ("%s:%d: " log_debug ("%s:%d: strtoul failed for TOFU DB data; returned string"
"strtoul failed for DB returned string (tail=%.10s): %s\n", " (string='%.10s%s'; tail='%.10s%s'): %s\n",
__FILE__, line, tail, gpg_strerror (err)); __FILE__, line,
string, string && strlen(string) > 10 ? "..." : "",
tail, tail && strlen(tail) > 10 ? "..." : "",
gpg_strerror (err));
*r_value = fallback; *r_value = fallback;
} }
else else