diff for duplicates of <20090216031523.GA16824@linux-sh.org> diff --git a/a/1.txt b/N1/1.txt index c79fa92..96daa94 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,7 +45,7 @@ Was the extra vowel really that much more work to write out? > + year--; > + > + day -= (year + 3) / 4 + 365 * year; -> + if (day = 59 && !(year & 3)) { +> + if (day == 59 && !(year & 3)) { > + nl_day = day; > + month = 2; > + } else { @@ -66,8 +66,10 @@ Was the extra vowel really that much more work to write out? > + > + bh->b_data[z + 0x11] = bcd_from_u8(u8year); > + bh->b_data[z + 0x12] = bcd_from_u8((__u8) month); -> + bh->b_data[z + 0x13] > + bcd_from_u8((__u8) day - day_n[month - 1] + 1); -> + bh->b_data[z + 0x14] > + bcd_from_u8((__u8) ((unix_date / 3600) % 24)); +> + bh->b_data[z + 0x13] = +> + bcd_from_u8((__u8) day - day_n[month - 1] + 1); +> + bh->b_data[z + 0x14] = +> + bcd_from_u8((__u8) ((unix_date / 3600) % 24)); > + bh->b_data[z + 0x15] = bcd_from_u8((__u8) ((unix_date / 60) % 60)); > + bh->b_data[z + 0x16] = bcd_from_u8((__u8) (unix_date % 60)); > + @@ -88,7 +90,8 @@ can include linux/bcd.h and use bin2bcd and bcd2bin directly. > + Just get rid of this if you aren't going to support it. -> + saved_file > + kmalloc(sizeof(struct vmufat_file_info), GFP_KERNEL); +> + saved_file = +> + kmalloc(sizeof(struct vmufat_file_info), GFP_KERNEL); > + Error handling? @@ -153,7 +156,7 @@ vmudetails is completely unused here, just kfree sb->s_fs_info. > + if ((year + 3) / 4 + 365 * year > day) > + year--; > + day -= (year + 3) / 4 + 365 * year; -> + if (day = 59 && !(year & 3)) { +> + if (day == 59 && !(year & 3)) { > + nl_day = day; > + month = 2; > + } else { @@ -172,8 +175,10 @@ vmudetails is completely unused here, just kfree sb->s_fs_info. > + u8year = u8year - 100; > + bh->b_data[z + 0x11] = bcd_from_u8(u8year); > + bh->b_data[z + 0x12] = bcd_from_u8((__u8) month); -> + bh->b_data[z + 0x13] > + bcd_from_u8((__u8) day - day_n[month - 1] + 1); -> + bh->b_data[z + 0x14] > + bcd_from_u8((__u8) ((unix_date / 3600) % 24)); +> + bh->b_data[z + 0x13] = +> + bcd_from_u8((__u8) day - day_n[month - 1] + 1); +> + bh->b_data[z + 0x14] = +> + bcd_from_u8((__u8) ((unix_date / 3600) % 24)); > + bh->b_data[z + 0x15] = bcd_from_u8((__u8) ((unix_date / 60) % 60)); > + bh->b_data[z + 0x16] = bcd_from_u8((__u8) (unix_date % 60)); > + @@ -193,10 +198,10 @@ Again, all of this can be simplified using rtc lib and bcd routines. This magic value is used in lots of places, you should have a define for it, and add it to linux/magic.h. -> + if (!((((__u32 *) bh->b_data)[0] = s_magic) -> + && (((__u32 *) bh->b_data)[1] = s_magic) -> + && (((__u32 *) bh->b_data)[2] = s_magic) -> + && (s_magic = ((__u32 *) bh->b_data)[3]))) +> + if (!((((__u32 *) bh->b_data)[0] == s_magic) +> + && (((__u32 *) bh->b_data)[1] == s_magic) +> + && (((__u32 *) bh->b_data)[2] == s_magic) +> + && (s_magic == ((__u32 *) bh->b_data)[3]))) > + return 0; &&'s at the end of the line. You can also switch the if to a return and diff --git a/a/content_digest b/N1/content_digest index 30cf061..0972dd0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01234646219.6609.37.camel@localhost.localdomain\0" "From\0Paul Mundt <lethal@linux-sh.org>\0" "Subject\0Re: [RFC][PATCH] filesystem: VMUFAT filesystem\0" - "Date\0Mon, 16 Feb 2009 03:15:24 +0000\0" + "Date\0Mon, 16 Feb 2009 12:15:24 +0900\0" "To\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Cc\0viro@zeniv.linux.org.uk" linux-fsdevel@vger.kernel.org @@ -56,7 +56,7 @@ "> +\t\tyear--;\n" "> +\n" "> +\tday -= (year + 3) / 4 + 365 * year;\n" - "> +\tif (day = 59 && !(year & 3)) {\n" + "> +\tif (day == 59 && !(year & 3)) {\n" "> +\t\tnl_day = day;\n" "> +\t\tmonth = 2;\n" "> +\t} else {\n" @@ -77,8 +77,10 @@ "> +\n" "> +\tbh->b_data[z + 0x11] = bcd_from_u8(u8year);\n" "> +\tbh->b_data[z + 0x12] = bcd_from_u8((__u8) month);\n" - "> +\tbh->b_data[z + 0x13] > +\t bcd_from_u8((__u8) day - day_n[month - 1] + 1);\n" - "> +\tbh->b_data[z + 0x14] > +\t bcd_from_u8((__u8) ((unix_date / 3600) % 24));\n" + "> +\tbh->b_data[z + 0x13] =\n" + "> +\t bcd_from_u8((__u8) day - day_n[month - 1] + 1);\n" + "> +\tbh->b_data[z + 0x14] =\n" + "> +\t bcd_from_u8((__u8) ((unix_date / 3600) % 24));\n" "> +\tbh->b_data[z + 0x15] = bcd_from_u8((__u8) ((unix_date / 60) % 60));\n" "> +\tbh->b_data[z + 0x16] = bcd_from_u8((__u8) (unix_date % 60));\n" "> +\n" @@ -99,7 +101,8 @@ "> +\n" "Just get rid of this if you aren't going to support it.\n" "\n" - "> +\tsaved_file > +\t kmalloc(sizeof(struct vmufat_file_info), GFP_KERNEL);\n" + "> +\tsaved_file =\n" + "> +\t kmalloc(sizeof(struct vmufat_file_info), GFP_KERNEL);\n" "> +\n" "Error handling?\n" "\n" @@ -164,7 +167,7 @@ "> +\tif ((year + 3) / 4 + 365 * year > day)\n" "> +\t\tyear--;\n" "> +\tday -= (year + 3) / 4 + 365 * year;\n" - "> +\tif (day = 59 && !(year & 3)) {\n" + "> +\tif (day == 59 && !(year & 3)) {\n" "> +\t\tnl_day = day;\n" "> +\t\tmonth = 2;\n" "> +\t} else {\n" @@ -183,8 +186,10 @@ "> +\t\tu8year = u8year - 100;\n" "> +\tbh->b_data[z + 0x11] = bcd_from_u8(u8year);\n" "> +\tbh->b_data[z + 0x12] = bcd_from_u8((__u8) month);\n" - "> +\tbh->b_data[z + 0x13] > +\t bcd_from_u8((__u8) day - day_n[month - 1] + 1);\n" - "> +\tbh->b_data[z + 0x14] > +\t bcd_from_u8((__u8) ((unix_date / 3600) % 24));\n" + "> +\tbh->b_data[z + 0x13] =\n" + "> +\t bcd_from_u8((__u8) day - day_n[month - 1] + 1);\n" + "> +\tbh->b_data[z + 0x14] =\n" + "> +\t bcd_from_u8((__u8) ((unix_date / 3600) % 24));\n" "> +\tbh->b_data[z + 0x15] = bcd_from_u8((__u8) ((unix_date / 60) % 60));\n" "> +\tbh->b_data[z + 0x16] = bcd_from_u8((__u8) (unix_date % 60));\n" "> +\n" @@ -204,10 +209,10 @@ "This magic value is used in lots of places, you should have a define for\n" "it, and add it to linux/magic.h.\n" "\n" - "> +\tif (!((((__u32 *) bh->b_data)[0] = s_magic)\n" - "> +\t && (((__u32 *) bh->b_data)[1] = s_magic)\n" - "> +\t && (((__u32 *) bh->b_data)[2] = s_magic)\n" - "> +\t && (s_magic = ((__u32 *) bh->b_data)[3])))\n" + "> +\tif (!((((__u32 *) bh->b_data)[0] == s_magic)\n" + "> +\t && (((__u32 *) bh->b_data)[1] == s_magic)\n" + "> +\t && (((__u32 *) bh->b_data)[2] == s_magic)\n" + "> +\t && (s_magic == ((__u32 *) bh->b_data)[3])))\n" "> +\t\treturn 0;\n" "\n" "&&'s at the end of the line. You can also switch the if to a return and\n" @@ -234,4 +239,4 @@ "difficult to follow what is going on, especially if the threads of\n" conversation diverge. -24d26b1a7d31186c8a6b961d40b565af36d8b6c2cd5231ad8d7f198e6bf79f0a +ead347e504ee69d303938b5b8795490cc41dc841eec44f1d241ca5d8aa26c82b
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.