aboutsummaryrefslogtreecommitdiffstats
path: root/lib/vsprintf.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/vsprintf.c')
-rw-r--r--lib/vsprintf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0967771d8f7f..e3bf4e0f10b5 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1739,6 +1739,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
1739 * 'h', 'l', or 'L' for integer fields 1739 * 'h', 'l', or 'L' for integer fields
1740 * 'z' support added 23/7/1999 S.H. 1740 * 'z' support added 23/7/1999 S.H.
1741 * 'z' changed to 'Z' --davidm 1/25/99 1741 * 'z' changed to 'Z' --davidm 1/25/99
1742 * 'Z' changed to 'z' --adobriyan 2017-01-25
1742 * 't' added for ptrdiff_t 1743 * 't' added for ptrdiff_t
1743 * 1744 *
1744 * @fmt: the format string 1745 * @fmt: the format string
@@ -1838,7 +1839,7 @@ qualifier:
1838 /* get the conversion qualifier */ 1839 /* get the conversion qualifier */
1839 qualifier = 0; 1840 qualifier = 0;
1840 if (*fmt == 'h' || _tolower(*fmt) == 'l' || 1841 if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
1841 _tolower(*fmt) == 'z' || *fmt == 't') { 1842 *fmt == 'z' || *fmt == 't') {
1842 qualifier = *fmt++; 1843 qualifier = *fmt++;
1843 if (unlikely(qualifier == *fmt)) { 1844 if (unlikely(qualifier == *fmt)) {
1844 if (qualifier == 'l') { 1845 if (qualifier == 'l') {
@@ -1907,7 +1908,7 @@ qualifier:
1907 else if (qualifier == 'l') { 1908 else if (qualifier == 'l') {
1908 BUILD_BUG_ON(FORMAT_TYPE_ULONG + SIGN != FORMAT_TYPE_LONG); 1909 BUILD_BUG_ON(FORMAT_TYPE_ULONG + SIGN != FORMAT_TYPE_LONG);
1909 spec->type = FORMAT_TYPE_ULONG + (spec->flags & SIGN); 1910 spec->type = FORMAT_TYPE_ULONG + (spec->flags & SIGN);
1910 } else if (_tolower(qualifier) == 'z') { 1911 } else if (qualifier == 'z') {
1911 spec->type = FORMAT_TYPE_SIZE_T; 1912 spec->type = FORMAT_TYPE_SIZE_T;
1912 } else if (qualifier == 't') { 1913 } else if (qualifier == 't') {
1913 spec->type = FORMAT_TYPE_PTRDIFF; 1914 spec->type = FORMAT_TYPE_PTRDIFF;
@@ -2657,7 +2658,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
2657 /* get conversion qualifier */ 2658 /* get conversion qualifier */
2658 qualifier = -1; 2659 qualifier = -1;
2659 if (*fmt == 'h' || _tolower(*fmt) == 'l' || 2660 if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
2660 _tolower(*fmt) == 'z') { 2661 *fmt == 'z') {
2661 qualifier = *fmt++; 2662 qualifier = *fmt++;
2662 if (unlikely(qualifier == *fmt)) { 2663 if (unlikely(qualifier == *fmt)) {
2663 if (qualifier == 'h') { 2664 if (qualifier == 'h') {
@@ -2851,7 +2852,6 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
2851 else 2852 else
2852 *va_arg(args, unsigned long long *) = val.u; 2853 *va_arg(args, unsigned long long *) = val.u;
2853 break; 2854 break;
2854 case 'Z':
2855 case 'z': 2855 case 'z':
2856 *va_arg(args, size_t *) = val.u; 2856 *va_arg(args, size_t *) = val.u;
2857 break; 2857 break;