mirror/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-26 15:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

mprintf: provide hex digits for escape.c to use

Browse Source 
Since they need the exact same set, use the same set. The mprintf string
was longer than it had to be.

Closes #17311
This commit is contained in:
Daniel Stenberg 2025-05-11 14:56:16 +02:00
parent 1eb3928db6
commit f862f863bf
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/curl_printf.h
View File

@ -30,6 +30,12 @@
#define MERR_MEM 1
#define MERR_TOO_LARGE 2
/* Lower-case digits. */
extern const unsigned char Curl_ldigits[];
/* Upper-case digits. */
extern const unsigned char Curl_udigits[];
#ifdef BUILDING_LIBCURL
/*

4
lib/escape.c
View File

@ -232,9 +232,7 @@ void Curl_hexbyte(unsigned char *dest, /* must fit two bytes */
unsigned char val,
bool lowercase)
{
const unsigned char uhex[] = "0123456789ABCDEF";
const unsigned char lhex[] = "0123456789abcdef";
const unsigned char *t = lowercase ? lhex : uhex;
const unsigned char *t = lowercase ? Curl_ldigits : Curl_udigits;
dest[0] = t[val >> 4];
dest[1] = t[val & 0x0F];
}

11
lib/mprintf.c
View File

@ -64,10 +64,10 @@
#endif
/* Lower-case digits. */
static const char lower_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
const unsigned char Curl_ldigits[] = "0123456789abcdef";
/* Upper-case digits. */
static const char upper_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
const unsigned char Curl_udigits[] = "0123456789ABCDEF";
#define OUTCHAR(x) \
do { \
@ -645,7 +645,7 @@ static int formatf(
va_list ap_save) /* list of parameters */
{
static const char nilstr[] = "(nil)";
const char *digits = lower_digits; /* Base-36 digits for numbers. */
const unsigned char *digits = Curl_ldigits;
int done = 0; /* number of characters written */
int i;
int ocount = 0; /* number of output segments */
@ -748,7 +748,7 @@ static int formatf(
}
else if(flags & FLAGS_HEX) {
/* Hexadecimal unsigned integer */
digits = (flags & FLAGS_UPPER) ? upper_digits : lower_digits;
digits = (flags & FLAGS_UPPER) ? Curl_udigits : Curl_ldigits;
base = 16;
is_neg = FALSE;
}
@ -777,6 +777,7 @@ number:
/* Put the number in WORK. */
w = workend;
DEBUGASSERT(base <= 16);
switch(base) {
case 10:
while(num > 0) {
@ -894,7 +895,7 @@ number:
if(iptr->val.ptr) {
/* If the pointer is not NULL, write it as a %#x spec. */
base = 16;
digits = (flags & FLAGS_UPPER) ? upper_digits : lower_digits;
digits = (flags & FLAGS_UPPER) ? Curl_udigits : Curl_ldigits;
is_alt = TRUE;
num = (size_t) iptr->val.ptr;
is_neg = FALSE;