diff options
| author | Michael Forney <mforney@mforney.org> | 2020-04-10 14:52:39 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-04-10 14:52:39 -0700 |
| commit | 0128e4c17480a6e8a3a478eeeb9304f97986bc63 (patch) | |
| tree | ada5a955012f8030156adf4115e11094cbc7d2e4 /pkg/strace/patch/0011-Avoid-index-ranges.patch | |
| parent | 60af056f78b258b7b96f76673eb3c0d710f73e20 (diff) | |
strace: Update to 5.6
Diffstat (limited to 'pkg/strace/patch/0011-Avoid-index-ranges.patch')
| -rw-r--r-- | pkg/strace/patch/0011-Avoid-index-ranges.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/strace/patch/0011-Avoid-index-ranges.patch b/pkg/strace/patch/0011-Avoid-index-ranges.patch index 2970397d..37346f38 100644 --- a/pkg/strace/patch/0011-Avoid-index-ranges.patch +++ b/pkg/strace/patch/0011-Avoid-index-ranges.patch @@ -1,4 +1,4 @@ -From bdcfe1c3c72cd0d31d6c6505287cb551738241e3 Mon Sep 17 00:00:00 2001 +From 72af628108986893f2212f17f081ecc475764e9c Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Thu, 30 Jan 2020 22:32:50 -0800 Subject: [PATCH] Avoid index ranges @@ -11,19 +11,19 @@ ignore this for now. 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/print_mac.c b/print_mac.c -index e851f307..435b1510 100644 +index c5d5f5c4..a7c54b3e 100644 --- a/print_mac.c +++ b/print_mac.c @@ -17,8 +17,6 @@ DIAG_PUSH_IGNORE_OVERRIDE_INIT static uint8_t hwaddr_sizes[] = { -- [0 ... ARPHRD_IEEE802_TR] = 255, +- [0 ... ARPHRD_VSOCKMON] = 255, - [ARPHRD_NETROM] = 7 /* AX25_ADDR_LEN */, [ARPHRD_ETHER] = 6 /* ETH_ALEN */, /* ARPHRD_EETHER - no actual devices in Linux */ -@@ -126,7 +124,7 @@ print_mac_addr(const char *prefix, const uint8_t addr[], size_t size) +@@ -128,7 +126,7 @@ print_mac_addr(const char *prefix, const uint8_t addr[], size_t size) const char * sprint_hwaddr(const uint8_t hwaddr[], size_t size, uint32_t devtype) { @@ -33,10 +33,10 @@ index e851f307..435b1510 100644 return sprint_mac_addr(hwaddr, MIN(size, sz)); diff --git a/util.c b/util.c -index 55bce30a..23a1f5da 100644 +index 522e772e..295b2bb9 100644 --- a/util.c +++ b/util.c -@@ -1105,16 +1105,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, +@@ -1241,16 +1241,16 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, ? 1 + ilog2_klong(len - 1) / HEX_BIT : DUMPSTR_OFFS_MIN_CHARS; kernel_ulong_t i = 0; const unsigned char *src; @@ -58,5 +58,5 @@ index 55bce30a..23a1f5da 100644 /* Fetching data from tracee. */ -- -2.25.0 +2.26.0 |