2002-09-28 Marcus Brinkmann <marcus@g10code.de>
* conversion.c (_gpgme_hextobyte): Prevent superfluous multiplication with base. Reported by St�phane Corth�sy. * keylist.c (gpgme_op_keylist_ext_start): Use private asynchronous operation type in invocation of _gpgme_op_reset.
This commit is contained in:
parent
21382e2d53
commit
056bb3b587
@ -1,3 +1,11 @@
|
||||
2002-09-28 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* conversion.c (_gpgme_hextobyte): Prevent superfluous
|
||||
multiplication with base. Reported by Stéphane Corthésy.
|
||||
|
||||
* keylist.c (gpgme_op_keylist_ext_start): Use private asynchronous
|
||||
operation type in invocation of _gpgme_op_reset.
|
||||
|
||||
2002-09-20 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* ath.c: Include sys/time.h if sys/select.h is not available.
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "gpgme.h"
|
||||
#include "util.h"
|
||||
@ -34,7 +35,8 @@ _gpgme_hextobyte (const byte *str)
|
||||
int val = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 2; i++)
|
||||
#define NROFHEXDIGITS 2
|
||||
for (i = 0; i < NROFHEXDIGITS; i++)
|
||||
{
|
||||
if (*str >= '0' && *str <= '9')
|
||||
val += *str - '0';
|
||||
@ -44,7 +46,8 @@ _gpgme_hextobyte (const byte *str)
|
||||
val += 10 + *str - 'a';
|
||||
else
|
||||
return -1;
|
||||
val *= 16;
|
||||
if (i < NROFHEXDIGITS - 1)
|
||||
val *= 16;
|
||||
str++;
|
||||
}
|
||||
return val;
|
||||
|
@ -633,9 +633,7 @@ gpgme_op_keylist_ext_start (GpgmeCtx ctx, const char *pattern[],
|
||||
{
|
||||
GpgmeError err = 0;
|
||||
|
||||
/* Keylist operations are always "synchronous" in the sense that we
|
||||
don't add ourself to the global FD table. */
|
||||
err = _gpgme_op_reset (ctx, 1);
|
||||
err = _gpgme_op_reset (ctx, 2);
|
||||
if (err)
|
||||
goto leave;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user