diff options
| -rw-r--r-- | lib/vsprintf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index c11205688fb4..4365df31a1d5 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -666,6 +666,8 @@ char *ip6_compressed_string(char *p, const char *addr) | |||
| 666 | colonpos = i; | 666 | colonpos = i; |
| 667 | } | 667 | } |
| 668 | } | 668 | } |
| 669 | if (longest == 1) /* don't compress a single 0 */ | ||
| 670 | colonpos = -1; | ||
| 669 | 671 | ||
| 670 | /* emit address */ | 672 | /* emit address */ |
| 671 | for (i = 0; i < range; i++) { | 673 | for (i = 0; i < range; i++) { |
| @@ -826,7 +828,7 @@ int kptr_restrict __read_mostly; | |||
| 826 | * IPv4 uses dot-separated decimal with leading 0's (010.123.045.006) | 828 | * IPv4 uses dot-separated decimal with leading 0's (010.123.045.006) |
| 827 | * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order | 829 | * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order |
| 828 | * - 'I6c' for IPv6 addresses printed as specified by | 830 | * - 'I6c' for IPv6 addresses printed as specified by |
| 829 | * http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00 | 831 | * http://tools.ietf.org/html/rfc5952 |
| 830 | * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form | 832 | * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form |
| 831 | * "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" | 833 | * "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" |
| 832 | * Options for %pU are: | 834 | * Options for %pU are: |