aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-09-02 19:25:07 -0400
committerAndrew Kelley <superjoe30@gmail.com>2018-09-02 19:25:07 -0400
commit8558caecb591af94a7e51cd226e7291a9337e76d (patch)
tree5ed3117bae6a4f67d067fa2a36888275363228b5 /std
parentab387bb4c712b257cc2b728a044ad67935dee2dc (diff)
parent3eb89ee4db31eef9540273b25689c0515da6bf57 (diff)
downloadzig-8558caecb591af94a7e51cd226e7291a9337e76d.tar.gz
zig-8558caecb591af94a7e51cd226e7291a9337e76d.zip
Merge branch 'kristate-std-fmt-hexToBytes'
Diffstat (limited to 'std')
-rw-r--r--std/fmt/index.zig21
1 files changed, 20 insertions, 1 deletions
diff --git a/std/fmt/index.zig b/std/fmt/index.zig
index f9b68d7941..80af750f3d 100644
--- a/std/fmt/index.zig
+++ b/std/fmt/index.zig
@@ -350,7 +350,7 @@ pub fn formatText(
comptime var width = 0;
if (fmt.len > 1) width = comptime (parseUnsigned(usize, fmt[1..], 10) catch unreachable);
return formatBuf(bytes, width, context, Errors, output);
- } else if ((fmt[0] == 'x') or (fmt[0] == 'X') ) {
+ } else if ((fmt[0] == 'x') or (fmt[0] == 'X')) {
for (bytes) |c| {
try formatInt(c, 16, fmt[0] == 'X', 2, context, Errors, output);
}
@@ -1331,3 +1331,22 @@ pub fn isWhiteSpace(byte: u8) bool {
else => false,
};
}
+
+pub fn hexToBytes(out: []u8, input: []const u8) !void {
+ if (out.len * 2 < input.len)
+ return error.InvalidLength;
+
+ var in_i: usize = 0;
+ while (in_i != input.len) : (in_i += 2) {
+ const hi = try charToDigit(input[in_i], 16);
+ const lo = try charToDigit(input[in_i + 1], 16);
+ out[in_i / 2] = (hi << 4) | lo;
+ }
+}
+
+test "fmt.hexToBytes" {
+ const test_hex_str = "909A312BB12ED1F819B3521AC4C1E896F2160507FFC1C8381E3B07BB16BD1706";
+ var pb: [32]u8 = undefined;
+ try hexToBytes(pb[0..], test_hex_str);
+ try testFmt(test_hex_str, "{X}", pb);
+}