mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
common: New function string_to_u64.
* common/stringhelp.c (string_to_u64): New. * dirmngr/http.c (longcounter_t): Remove. (struct cookie_s): Change content_length to uint64_t. (parse_response): Use string_to_u64. -- Meanwhile we allow some C99 features including stdint.h. Thus we can simplify things now. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
72fa314b71
commit
0698324cde
4 changed files with 25 additions and 14 deletions
|
@ -130,15 +130,6 @@
|
|||
"01234567890@" \
|
||||
"!\"#$%&'()*+,-./:;<=>?[\\]^_{|}~"
|
||||
|
||||
/* A long counter type. */
|
||||
#ifdef HAVE_STRTOULL
|
||||
typedef unsigned long long longcounter_t;
|
||||
# define counter_strtoul(a) strtoull ((a), NULL, 10)
|
||||
#else
|
||||
typedef unsigned long longcounter_t;
|
||||
# define counter_strtoul(a) strtoul ((a), NULL, 10)
|
||||
#endif
|
||||
|
||||
#if HTTP_USE_NTBTLS
|
||||
typedef ntbtls_t tls_session_t;
|
||||
# define USE_TLS 1
|
||||
|
@ -206,7 +197,7 @@ struct cookie_s
|
|||
|
||||
/* The remaining content length and a flag telling whether to use
|
||||
the content length. */
|
||||
longcounter_t content_length;
|
||||
uint64_t content_length;
|
||||
unsigned int content_length_valid:1;
|
||||
};
|
||||
typedef struct cookie_s *cookie_t;
|
||||
|
@ -2170,7 +2161,7 @@ parse_response (http_t hd)
|
|||
if (s)
|
||||
{
|
||||
cookie->content_length_valid = 1;
|
||||
cookie->content_length = counter_strtoul (s);
|
||||
cookie->content_length = string_to_u64 (s);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue