diff for duplicates of <4EE1B0AD.3070904@ozlabs.org> diff --git a/a/1.txt b/N1/1.txt index 3178a52..56abe10 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,8 +27,8 @@ index 0bbe9ba..d26e3d7 100644 if (lseek(fd, 0, SEEK_SET) < 0) die_perror("lseek"); -- return id[0] = GZIP_ID1 && id[1] = GZIP_ID2; -+ return (id[0] = GZIP_ID1 && id[1] = GZIP_ID2) || +- return id[0] == GZIP_ID1 && id[1] == GZIP_ID2; ++ return (id[0] == GZIP_ID1 && id[1] == GZIP_ID2) || + !memcmp(id, CPIO_MAGIC, 4); } diff --git a/a/content_digest b/N1/content_digest index 1a6e606..9af3417 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0cover.1323413420.git.matt@ozlabs.org\0" "From\0Matt Evans <matt@ozlabs.org>\0" "Subject\0[PATCH V2 12/23] kvm tools: Allow initrd_check() to match a cpio\0" - "Date\0Fri, 09 Dec 2011 06:54:37 +0000\0" + "Date\0Fri, 09 Dec 2011 17:54:37 +1100\0" "To\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" "Cc\0penberg@kernel.org" @@ -39,11 +39,11 @@ " \tif (lseek(fd, 0, SEEK_SET) < 0)\n" " \t\tdie_perror(\"lseek\");\n" " \n" - "-\treturn id[0] = GZIP_ID1 && id[1] = GZIP_ID2;\n" - "+\treturn (id[0] = GZIP_ID1 && id[1] = GZIP_ID2) ||\n" + "-\treturn id[0] == GZIP_ID1 && id[1] == GZIP_ID2;\n" + "+\treturn (id[0] == GZIP_ID1 && id[1] == GZIP_ID2) ||\n" "+\t\t!memcmp(id, CPIO_MAGIC, 4);\n" " }\n" " \n" bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, -1a7793636977e77f10ec27a3190d09899f4ac635004e53bb7ace60341955b075 +3c608283980247258df7e0c3bd0bd562104342d67ed4f5e8cef47e1d8e823c68
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.