GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Use 64 bit instead of gpgme_off_t for some internal functions.

Browse Source 
* src/conversion.c (_gpgme_string_to_off): Return an u64 value.
* src/data.c (_gpgme_data_get_size_hint): Ditto.
(gpgme_data_set_flag): Use u64 for io-buffer-size due to string_to_off
change.
* src/data.h (struct gpgme_data): Change size_hint to u64.
* src/engine-gpg.c (add_input_size_hint): Replace gpgme_off_t by u64.
--

GnuPG-bug-id: 6534
This commit is contained in:
Werner Koch 2023-06-15 10:58:57 +02:00
parent 7e6d51aa6f
commit eb68948c43
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conversion.c
View File

@ -434,10 +434,10 @@ _gpgme_strtoul_field (const char *string, unsigned long *result)
/* Convert STRING into an offset value. Note that this functions only /* Convert STRING into an offset value. Note that this functions only
* allows for a base-10 length. This function is similar to atoi() * allows for a base-10 length. This function is similar to atoi()
* and thus there is no error checking. */ * and thus there is no error checking. */
gpgme_off_t uint64_t
_gpgme_string_to_off (const char *string) _gpgme_string_to_off (const char *string)
{ {
gpgme_off_t value = 0; uint64_t value = 0;
while (*string == ' ' || *string == '\t') while (*string == ' ' || *string == '\t')
string++; string++;

4
src/data.c
View File

@ -572,7 +572,7 @@ gpgme_data_set_flag (gpgme_data_t dh, const char *name, const char *value)
} }
else if (!strcmp (name, "io-buffer-size")) else if (!strcmp (name, "io-buffer-size"))
{ {
gpgme_off_t val; uint64_t val;
/* We may set this only once. */ /* We may set this only once. */
if (dh->io_buffer_size) if (dh->io_buffer_size)
@ -744,7 +744,7 @@ _gpgme_data_get_fd (gpgme_data_t dh)
/* Get the size-hint value for DH or 0 if not available. */ /* Get the size-hint value for DH or 0 if not available. */
gpgme_off_t uint64_t
_gpgme_data_get_size_hint (gpgme_data_t dh) _gpgme_data_get_size_hint (gpgme_data_t dh)
{ {
return dh ? dh->size_hint : 0; return dh ? dh->size_hint : 0;

4
src/data.h
View File

@ -96,7 +96,7 @@ struct gpgme_data
char *file_name; char *file_name;
/* Hint on the to be expected total size of the data. */ /* Hint on the to be expected total size of the data. */
gpgme_off_t size_hint; uint64_t size_hint;
/* If no 0 the size of an allocated inbound or outpund buffers. The /* If no 0 the size of an allocated inbound or outpund buffers. The
* value is at least BUFFER_SIZE and capped at 1MiB. */ * value is at least BUFFER_SIZE and capped at 1MiB. */
@ -189,7 +189,7 @@ void _gpgme_data_release (gpgme_data_t dh);
int _gpgme_data_get_fd (gpgme_data_t dh); int _gpgme_data_get_fd (gpgme_data_t dh);
/* Get the size-hint value for DH or 0 if not available. */ /* Get the size-hint value for DH or 0 if not available. */
gpgme_off_t _gpgme_data_get_size_hint (gpgme_data_t dh); uint64_t _gpgme_data_get_size_hint (gpgme_data_t dh);
#endif /* DATA_H */ #endif /* DATA_H */

2
src/engine-gpg.c
View File

@ -1774,7 +1774,7 @@ start (engine_gpg_t gpg)
static gpgme_error_t static gpgme_error_t
add_input_size_hint (engine_gpg_t gpg, gpgme_data_t data) add_input_size_hint (engine_gpg_t gpg, gpgme_data_t data)
{ {
gpgme_off_t value = _gpgme_data_get_size_hint (data); uint64_t value = _gpgme_data_get_size_hint (data);
char numbuf[50]; /* Large enough for even 2^128 in base-10. */ char numbuf[50]; /* Large enough for even 2^128 in base-10. */
char *p; char *p;

4
src/util.h
View File

@ -35,6 +35,8 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <stdint.h>
#include "gpgme.h" #include "gpgme.h"
@ -143,7 +145,7 @@ int _gpgme_split_fields (char *string, char **array, int arraysize);
gpgme_error_t _gpgme_strtoul_field (const char *string, unsigned long *result); gpgme_error_t _gpgme_strtoul_field (const char *string, unsigned long *result);
/* Convert STRING into an offset value similar to atoi(). */ /* Convert STRING into an offset value similar to atoi(). */
gpgme_off_t _gpgme_string_to_off (const char *string); uint64_t _gpgme_string_to_off (const char *string);
/* Parse the string TIMESTAMP into a time_t. The string may either be /* Parse the string TIMESTAMP into a time_t. The string may either be
seconds since Epoch or in the ISO 8601 format like seconds since Epoch or in the ISO 8601 format like