diff for duplicates of <1449695786.25389.67.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index aac3f02..00f32b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On Wed, 2015-12-09@14:09 -0700, Keith Busch wrote: +On Wed, 2015-12-09 at 14:09 -0700, Keith Busch wrote: > MAC addresses may be formed using rules based on EUI-64, which is 2 bytes > longer than a typical 6-byte MAC. This patch adds a long specifier to > the %pM format to support the extended unique identifier. @@ -7,30 +7,30 @@ On Wed, 2015-12-09@14:09 -0700, Keith Busch wrote: > initializes the separator during its declaration, and removes the switch > fall through case. > -> Signed-off-by: Keith Busch <keith.busch at intel.com> +> Signed-off-by: Keith Busch <keith.busch@intel.com> > --- > Changed from previos version: > -> ? Fixed checks for the 'l' specifier. This can be in fmt[1] or fmt[2], -> ? pointed out by Joe Perches from original review (thanks!). +> Fixed checks for the 'l' specifier. This can be in fmt[1] or fmt[2], +> pointed out by Joe Perches from original review (thanks!). [] > diff --git a/lib/vsprintf.c b/lib/vsprintf.c [] > @@ -902,20 +902,33 @@ char *mac_address_string(char *buf, char *end, u8 *addr, -> ? -> ? case 'R': -> ? reversed = true; +> +> case 'R': +> reversed = true; > - /* fall through */ > + break; > + > + case 'l': > + bytes = 8; > + break; -> ? -> ? default: +> +> default: > - separator = ':'; -> ? break; -> ? } +> break; +> } > + if (separator == '-' || reversed) { > + /* 'F' and 'R' may take additional length specifier */ > + switch (fmt[2]) { diff --git a/a/content_digest b/N1/content_digest index ab152b8..9a1c48b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,18 @@ "ref\01449695357-22163-1-git-send-email-keith.busch@intel.com\0" - "From\0joe@perches.com (Joe Perches)\0" - "Subject\0[PATCHv2] printf: Add format for 8-byte EUI-64 type\0" + "From\0Joe Perches <joe@perches.com>\0" + "Subject\0Re: [PATCHv2] printf: Add format for 8-byte EUI-64 type\0" "Date\0Wed, 09 Dec 2015 13:16:26 -0800\0" + "To\0Keith Busch <keith.busch@intel.com>" + linux-nvme@lists.infradead.org + " LKML <linux-kernel@vger.kernel.org>\0" + "Cc\0Matthew Wilcox <willy@linux.intel.com>" + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Jens Axboe <axboe@fb.com> + Christoph Hellwig <hch@infradead.org> + " Dan Williams <dan.j.williams@intel.com>\0" "\00:1\0" "b\0" - "On Wed, 2015-12-09@14:09 -0700, Keith Busch wrote:\n" + "On Wed, 2015-12-09 at 14:09 -0700, Keith Busch wrote:\n" "> MAC addresses may be formed using rules based on EUI-64, which is 2 bytes\n" "> longer than a typical 6-byte MAC. This patch adds a long specifier to\n" "> the %pM format to support the extended unique identifier.\n" @@ -13,30 +21,30 @@ "> initializes the separator during its declaration, and removes the switch\n" "> fall through case.\n" "> \n" - "> Signed-off-by: Keith Busch <keith.busch at intel.com>\n" + "> Signed-off-by: Keith Busch <keith.busch@intel.com>\n" "> ---\n" "> Changed from previos version:\n" "> \n" - "> ? Fixed checks for the 'l' specifier. This can be in fmt[1] or fmt[2],\n" - "> ? pointed out by Joe Perches from original review (thanks!).\n" + "> \302\240 Fixed checks for the 'l' specifier. This can be in fmt[1] or fmt[2],\n" + "> \302\240 pointed out by Joe Perches from original review (thanks!).\n" "[]\n" "> diff --git a/lib/vsprintf.c b/lib/vsprintf.c\n" "[]\n" "> @@ -902,20 +902,33 @@ char *mac_address_string(char *buf, char *end, u8 *addr,\n" - "> ?\n" - "> ?\tcase 'R':\n" - "> ?\t\treversed = true;\n" + "> \302\240\n" + "> \302\240\tcase 'R':\n" + "> \302\240\t\treversed = true;\n" "> -\t\t/* fall through */\n" "> +\t\tbreak;\n" "> +\n" "> +\tcase 'l':\n" "> +\t\tbytes = 8;\n" "> +\t\tbreak;\n" - "> ?\n" - "> ?\tdefault:\n" + "> \302\240\n" + "> \302\240\tdefault:\n" "> -\t\tseparator = ':';\n" - "> ?\t\tbreak;\n" - "> ?\t}\n" + "> \302\240\t\tbreak;\n" + "> \302\240\t}\n" "> +\tif (separator == '-' || reversed) {\n" "> +\t\t/* 'F' and 'R' may take additional length specifier */\n" "> +\t\tswitch (fmt[2]) {\n" @@ -52,4 +60,4 @@ "Using a while (isalpha(*++fmt)) loop like ip6_addr_string_sa\n" would probably be simpler. -a4a27152a295a6f1121968cf02926080e06435c18159ae7937bcacaf1fd269d7 +a331cc0e6286e23f34ff7dd7a8c5b503123364ff0458a3e056821a234f3a1f44
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.