uric & print: use %W for printing escaped characters

baresip · Mar 23, 2023 · 17fa4a4 · 17fa4a4
1 parent 0889e4c
commit 17fa4a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/fmt/print.c b/src/fmt/print.c
@@ -382,16 +382,10 @@ int re_vhprintf(const char *fmt, va_list ap, re_vprintf_h *vph, void *arg)
 			}
 
 			len = local_itoa(num, n, base, uc);
-			if (fpad != (size_t)-1) {
-				err |= write_padded(num + len - fpad, fpad, 0,
-						plr ? ' ' : pch, plr, NULL,
-						vph, arg);
-			}
-			else {
-				err |= write_padded(num, len, pad,
-						    plr ? ' ' : pch, plr, NULL,
-						    vph, arg);
-			}
+
+			err |= write_padded(num, len, pad,
+					    plr ? ' ' : pch, plr, NULL,
+					    vph, arg);
 			break;
 
 		case 'v':

diff --git a/src/uri/uric.c b/src/uri/uric.c
@@ -174,10 +174,7 @@ static int comp_escape(struct re_printf *pf, const struct pl *pl, esc_h *eh)
 			err = pf->vph(&c, 1, pf->arg);
 		}
 		else {
-			if (c < 0)
-				err = re_hprintf(pf, "%%%02.X", c);
-			else
-				err = re_hprintf(pf, "%%%02X", c);
+			err = re_hprintf(pf, "%%%W", &c, 1);
 		}
 	}