diff for duplicates of <567AE463.4080702@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 5f2a488..4df7ade 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -152,7 +152,7 @@ index 6fc9150..3ebe033 100644 } vm->vblk_size = get_unaligned_be32(data + 0x08); - if (vm->vblk_size = 0) { + if (vm->vblk_size == 0) { - ldm_error ("Illegal VBLK size"); + ldm_error("Illegal VBLK size"); return false; @@ -177,12 +177,12 @@ index 6fc9150..3ebe033 100644 - BUG_ON (!ph1 || !ph2); + BUG_ON(!ph1 || !ph2); - return ((ph1->ver_major = ph2->ver_major) && - (ph1->ver_minor = ph2->ver_minor) && + return ((ph1->ver_major == ph2->ver_major) && + (ph1->ver_minor == ph2->ver_minor) && @@ -286,7 +287,7 @@ static bool ldm_compare_privheads (const struct privhead *ph1, - (ph1->logical_disk_size = ph2->logical_disk_size) && - (ph1->config_start = ph2->config_start) && - (ph1->config_size = ph2->config_size) && + (ph1->logical_disk_size == ph2->logical_disk_size) && + (ph1->config_start == ph2->config_start) && + (ph1->config_size == ph2->config_size) && - !memcmp (ph1->disk_id, ph2->disk_id, GUID_SIZE)); + !memcmp(ph1->disk_id, ph2->disk_id, GUID_SIZE)); } @@ -199,10 +199,10 @@ index 6fc9150..3ebe033 100644 - BUG_ON (!toc1 || !toc2); + BUG_ON(!toc1 || !toc2); - return ((toc1->bitmap1_start = toc2->bitmap1_start) && - (toc1->bitmap1_size = toc2->bitmap1_size) && - (toc1->bitmap2_start = toc2->bitmap2_start) && - (toc1->bitmap2_size = toc2->bitmap2_size) && + return ((toc1->bitmap1_start == toc2->bitmap1_start) && + (toc1->bitmap1_size == toc2->bitmap1_size) && + (toc1->bitmap2_start == toc2->bitmap2_start) && + (toc1->bitmap2_size == toc2->bitmap2_size) && - !strncmp (toc1->bitmap1_name, toc2->bitmap1_name, - sizeof (toc1->bitmap1_name)) && - !strncmp (toc1->bitmap2_name, toc2->bitmap2_name, @@ -774,7 +774,7 @@ index 6fc9150..3ebe033 100644 - struct vblk *v = list_entry (item, struct vblk, list); + list_for_each(item, &ldb->v_part) { + struct vblk *v = list_entry(item, struct vblk, list); - if ((v->vblk.part.disk_id = vb->vblk.part.disk_id) && + if ((v->vblk.part.disk_id == vb->vblk.part.disk_id) && (v->vblk.part.start > vb->vblk.part.start)) { - list_add_tail (&vb->list, &v->list); + list_add_tail(&vb->list, &v->list); @@ -819,7 +819,7 @@ index 6fc9150..3ebe033 100644 - f = list_entry (item, struct frag, list); + list_for_each(item, frags) { + f = list_entry(item, struct frag, list); - if (f->group = group) + if (f->group == group) goto found; } @@ -903,7 +903,7 @@ index 6fc9150..3ebe033 100644 } recs = get_unaligned_be16(data + 0x0E); /* Number of records */ - if (recs = 1) { + if (recs == 1) { - if (!ldm_ldmdb_add (data, size, ldb)) + if (!ldm_ldmdb_add(data, size, ldb)) goto out; /* Already logged */ diff --git a/a/content_digest b/N1/content_digest index e9f9c9c..17e4aa8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\0567AE1C6.9020108@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 5/5] block-LDM: Fine-tuning for the source code formatting\0" - "Date\0Wed, 23 Dec 2015 18:13:55 +0000\0" + "Date\0Wed, 23 Dec 2015 19:13:55 +0100\0" "To\0linux-ntfs-dev@lists.sourceforge.net" linux-block@vger.kernel.org Jens Axboe <axboe@kernel.dk> @@ -168,7 +168,7 @@ " \t}\n" " \n" " \tvm->vblk_size = get_unaligned_be32(data + 0x08);\n" - " \tif (vm->vblk_size = 0) {\n" + " \tif (vm->vblk_size == 0) {\n" "-\t\tldm_error (\"Illegal VBLK size\");\n" "+\t\tldm_error(\"Illegal VBLK size\");\n" " \t\treturn false;\n" @@ -193,12 +193,12 @@ "-\tBUG_ON (!ph1 || !ph2);\n" "+\tBUG_ON(!ph1 || !ph2);\n" " \n" - " \treturn ((ph1->ver_major = ph2->ver_major)\t\t&&\n" - " \t\t(ph1->ver_minor = ph2->ver_minor)\t\t&&\n" + " \treturn ((ph1->ver_major == ph2->ver_major)\t\t&&\n" + " \t\t(ph1->ver_minor == ph2->ver_minor)\t\t&&\n" "@@ -286,7 +287,7 @@ static bool ldm_compare_privheads (const struct privhead *ph1,\n" - " \t\t(ph1->logical_disk_size = ph2->logical_disk_size)\t&&\n" - " \t\t(ph1->config_start = ph2->config_start)\t\t&&\n" - " \t\t(ph1->config_size = ph2->config_size)\t\t&&\n" + " \t\t(ph1->logical_disk_size == ph2->logical_disk_size)\t&&\n" + " \t\t(ph1->config_start == ph2->config_start)\t\t&&\n" + " \t\t(ph1->config_size == ph2->config_size)\t\t&&\n" "-\t\t!memcmp (ph1->disk_id, ph2->disk_id, GUID_SIZE));\n" "+\t\t!memcmp(ph1->disk_id, ph2->disk_id, GUID_SIZE));\n" " }\n" @@ -215,10 +215,10 @@ "-\tBUG_ON (!toc1 || !toc2);\n" "+\tBUG_ON(!toc1 || !toc2);\n" " \n" - " \treturn ((toc1->bitmap1_start = toc2->bitmap1_start)\t&&\n" - " \t\t(toc1->bitmap1_size = toc2->bitmap1_size)\t&&\n" - " \t\t(toc1->bitmap2_start = toc2->bitmap2_start)\t&&\n" - " \t\t(toc1->bitmap2_size = toc2->bitmap2_size)\t&&\n" + " \treturn ((toc1->bitmap1_start == toc2->bitmap1_start)\t&&\n" + " \t\t(toc1->bitmap1_size == toc2->bitmap1_size)\t&&\n" + " \t\t(toc1->bitmap2_start == toc2->bitmap2_start)\t&&\n" + " \t\t(toc1->bitmap2_size == toc2->bitmap2_size)\t&&\n" "-\t\t!strncmp (toc1->bitmap1_name, toc2->bitmap1_name,\n" "-\t\t\tsizeof (toc1->bitmap1_name))\t\t&&\n" "-\t\t!strncmp (toc1->bitmap2_name, toc2->bitmap2_name,\n" @@ -790,7 +790,7 @@ "-\t\t\tstruct vblk *v = list_entry (item, struct vblk, list);\n" "+\t\tlist_for_each(item, &ldb->v_part) {\n" "+\t\t\tstruct vblk *v = list_entry(item, struct vblk, list);\n" - " \t\t\tif ((v->vblk.part.disk_id = vb->vblk.part.disk_id) &&\n" + " \t\t\tif ((v->vblk.part.disk_id == vb->vblk.part.disk_id) &&\n" " \t\t\t (v->vblk.part.start > vb->vblk.part.start)) {\n" "-\t\t\t\tlist_add_tail (&vb->list, &v->list);\n" "+\t\t\t\tlist_add_tail(&vb->list, &v->list);\n" @@ -835,7 +835,7 @@ "-\t\tf = list_entry (item, struct frag, list);\n" "+\tlist_for_each(item, frags) {\n" "+\t\tf = list_entry(item, struct frag, list);\n" - " \t\tif (f->group = group)\n" + " \t\tif (f->group == group)\n" " \t\t\tgoto found;\n" " \t}\n" " \n" @@ -919,7 +919,7 @@ " \t\t\t}\n" " \n" " \t\t\trecs = get_unaligned_be16(data + 0x0E);\t/* Number of records */\n" - " \t\t\tif (recs = 1) {\n" + " \t\t\tif (recs == 1) {\n" "-\t\t\t\tif (!ldm_ldmdb_add (data, size, ldb))\n" "+\t\t\t\tif (!ldm_ldmdb_add(data, size, ldb))\n" " \t\t\t\t\tgoto out;\t/* Already logged */\n" @@ -1022,4 +1022,4 @@ "-- \n" 2.6.3 -37b1f74c78f23275eb3127bd9d0d09d037eba5535987f5748e9d0dbb4f11f4ab +9f0abb9704df88edba7eca5caa7220554fd51464624ae7376c08e6124c1b901b
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.