diff for duplicates of <20080828214501.GT9193@ghostprotocols.net> diff --git a/a/1.txt b/N1/1.txt index 633eb52..1040d1a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,14 +76,14 @@ feat len, which I did some weeks ago, but... > + return -EINVAL; > + > + val = kmalloc(optlen, GFP_KERNEL); -> + if (val = NULL) +> + if (val == NULL) > + return -ENOMEM; > + > + if (copy_from_user(val, optval, optlen)) > + rc = -EFAULT; > + > + lock_sock(sk); -> + if (!rc && (type = DCCP_SOCKOPT_TX_CCID || type = DCCP_SOCKOPT_CCID)) +> + if (!rc && (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID)) > + rc = dccp_feat_register_sp(sk, DCCPF_CCID, 1, val, optlen); > + @@ -95,10 +95,10 @@ This _really_ is confusing! Why not: lock_sock(sk); rc = 0; - if (type = DCCP_SOCKOPT_TX_CCID || type = DCCP_SOCKOPT_CCID) + if (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID) rc = dccp_feat_register_sp(sk, DCCPF_CCID, 1, val, optlen); - if (!rc && (type = DCCP_SOCKOPT_RX_CCID || type = DCCP_SOCKOPT_CCID)) + if (!rc && (type == DCCP_SOCKOPT_RX_CCID || type == DCCP_SOCKOPT_CCID)) rc = dccp_feat_register_sp(sk, DCCPF_CCID, 0, val, optlen); release_sock(sk); out: diff --git a/a/content_digest b/N1/content_digest index 178e573..0357dbb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,19 @@ + "ref\01219945512-7723-7-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-8-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-9-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-10-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-11-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-12-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-13-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-14-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-15-git-send-email-gerrit@erg.abdn.ac.uk\0" "ref\01219945512-7723-16-git-send-email-gerrit@erg.abdn.ac.uk\0" "From\0Arnaldo Carvalho de Melo <acme@redhat.com>\0" "Subject\0Re: [PATCH 15/37] dccp: Set per-connection CCIDs via socket options\0" - "Date\0Thu, 28 Aug 2008 21:45:01 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Thu, 28 Aug 2008 18:45:01 -0300\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>\0" + "Cc\0dccp@vger.kernel.org" + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "Em Thu, Aug 28, 2008 at 07:44:50PM +0200, Gerrit Renker escreveu:\n" @@ -83,14 +94,14 @@ "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval = kmalloc(optlen, GFP_KERNEL);\n" - "> +\tif (val = NULL)\n" + "> +\tif (val == NULL)\n" "> +\t\treturn -ENOMEM;\n" "> +\n" "> +\tif (copy_from_user(val, optval, optlen))\n" "> +\t\trc = -EFAULT;\n" "> +\n" "> +\tlock_sock(sk);\n" - "> +\tif (!rc && (type = DCCP_SOCKOPT_TX_CCID || type = DCCP_SOCKOPT_CCID))\n" + "> +\tif (!rc && (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID))\n" "> +\t\trc = dccp_feat_register_sp(sk, DCCPF_CCID, 1, val, optlen);\n" "> +\n" "\n" @@ -102,10 +113,10 @@ "\n" "\tlock_sock(sk);\n" "\trc = 0;\n" - "\tif (type = DCCP_SOCKOPT_TX_CCID || type = DCCP_SOCKOPT_CCID)\n" + "\tif (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID)\n" "\t\trc = dccp_feat_register_sp(sk, DCCPF_CCID, 1, val, optlen);\n" "\n" - "\tif (!rc && (type = DCCP_SOCKOPT_RX_CCID || type = DCCP_SOCKOPT_CCID))\n" + "\tif (!rc && (type == DCCP_SOCKOPT_RX_CCID || type == DCCP_SOCKOPT_CCID))\n" "\t\trc = dccp_feat_register_sp(sk, DCCPF_CCID, 0, val, optlen);\n" "\trelease_sock(sk);\n" "out:\n" @@ -143,4 +154,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -0815b1a81ff4cd47bef7d19fdb1b225c197d9fa96e83b724a7e808f9171072af +89d19627a128e54bfc29a951dfc636ecdf79b147f7396e583753ecb10c0078fe
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.