diff for duplicates of <1545501821.4383.2.camel@kernel.org> diff --git a/a/1.txt b/N1/1.txt index e34127a..f34069b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,9 +49,9 @@ Tom > > if (attrs->n_actions >= HIST_ACTIONS_MAX) > > return ret; > > -> > - if ((strncmp(str, "onmatch(", sizeof("onmatch(") - 1) = +> > - if ((strncmp(str, "onmatch(", sizeof("onmatch(") - 1) == > > 0) || -> > - (strncmp(str, "onmax(", sizeof("onmax(") - 1) = 0)) { +> > - (strncmp(str, "onmax(", sizeof("onmax(") - 1) == 0)) { > > + if ((str_has_prefix(str, "onmatch(")) || > > + (str_has_prefix(str, "onmax("))) { > > attrs->action_str[attrs->n_actions] = kstrdup(str, @@ -63,8 +63,8 @@ Tom > > { > > int ret = 0; > > -> > - if ((strncmp(str, "key=", sizeof("key=") - 1) = 0) || -> > - (strncmp(str, "keys=", sizeof("keys=") - 1) = 0)) { +> > - if ((strncmp(str, "key=", sizeof("key=") - 1) == 0) || +> > - (strncmp(str, "keys=", sizeof("keys=") - 1) == 0)) { > > + if ((str_has_prefix(str, "key=")) || > > + (str_has_prefix(str, "keys="))) { > > attrs->keys_str = kstrdup(str, GFP_KERNEL); @@ -72,12 +72,12 @@ Tom > > ret = -ENOMEM; > > goto out; > > } -> > - } else if ((strncmp(str, "val=", sizeof("val=") - 1) = 0) +> > - } else if ((strncmp(str, "val=", sizeof("val=") - 1) == 0) > > || -> > - (strncmp(str, "vals=", sizeof("vals=") - 1) = 0) +> > - (strncmp(str, "vals=", sizeof("vals=") - 1) == 0) > > || > > - (strncmp(str, "values=", sizeof("values=") - 1) -> > = 0)) { +> > == 0)) { > > + } else if ((str_has_prefix(str, "val=")) || > > + (str_has_prefix(str, "vals=")) || > > + (str_has_prefix(str, "values="))) { @@ -86,7 +86,7 @@ Tom > > ret = -ENOMEM; > > goto out; > > } -> > - } else if (strncmp(str, "sort=", sizeof("sort=") - 1) = +> > - } else if (strncmp(str, "sort=", sizeof("sort=") - 1) == > > 0) { > > + } else if (str_has_prefix(str, "sort=")) { > > attrs->sort_key_str = kstrdup(str, GFP_KERNEL); @@ -94,7 +94,7 @@ Tom > > ret = -ENOMEM; > > goto out; > > } -> > - } else if (strncmp(str, "name=", sizeof("name=") - 1) = +> > - } else if (strncmp(str, "name=", sizeof("name=") - 1) == > > 0) { > > + } else if (str_has_prefix(str, "name=")) { > > attrs->name = kstrdup(str, GFP_KERNEL); @@ -102,7 +102,7 @@ Tom > > ret = -ENOMEM; > > goto out; > > } -> > - } else if (strncmp(str, "clock=", sizeof("clock=") - 1) = +> > - } else if (strncmp(str, "clock=", sizeof("clock=") - 1) == > > 0) { > > + } else if (str_has_prefix(str, "clock=")) { > > strsep(&str, "="); @@ -113,7 +113,7 @@ Tom > > ret = -ENOMEM; > > goto out; > > } -> > - } else if (strncmp(str, "size=", sizeof("size=") - 1) = +> > - } else if (strncmp(str, "size=", sizeof("size=") - 1) == > > 0) { > > + } else if (str_has_prefix(str, "size=")) { > > int map_bits = parse_map_size(str); @@ -124,7 +124,7 @@ Tom > > if (!onmax_fn_name || !str) > > goto free; > > -> > - if (strncmp(onmax_fn_name, "save", sizeof("save") - 1) = +> > - if (strncmp(onmax_fn_name, "save", sizeof("save") - 1) == > > 0) { > > + if (str_has_prefix(onmax_fn_name, "save")) { > > char *params = strsep(&str, ")"); @@ -136,7 +136,7 @@ Tom > > str = hist_data->attrs->action_str[i]; > > > > - if (strncmp(str, "onmatch(", sizeof("onmatch(") - -> > 1) = 0) { +> > 1) == 0) { > > + if (str_has_prefix(str, "onmatch(")) { > > char *action_str = str + > > sizeof("onmatch(") - 1; @@ -148,7 +148,7 @@ Tom > > } > > data->fn = action_trace; > > - } else if (strncmp(str, "onmax(", sizeof("onmax(") -> > - 1) = 0) { +> > - 1) == 0) { > > + } else if (str_has_prefix(str, "onmax(")) { > > char *action_str = str + sizeof("onmax(") > > - 1; diff --git a/a/content_digest b/N1/content_digest index 85b0280..29734f8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020181222130107.43aaac9c@gandalf.local.home\0" "From\0Tom Zanussi <zanussi@kernel.org>\0" "Subject\0Re: [for-next][PATCH 2/5] tracing: Use str_has_prefix() helper for histogram code\0" - "Date\0Sat, 22 Dec 2018 18:03:41 +0000\0" + "Date\0Sat, 22 Dec 2018 12:03:41 -0600\0" "To\0Steven Rostedt <rostedt@goodmis.org>\0" "Cc\0linux-kernel@vger.kernel.org" Ingo Molnar <mingo@kernel.org> @@ -67,9 +67,9 @@ "> > \tif (attrs->n_actions >= HIST_ACTIONS_MAX)\n" "> > \t\treturn ret;\n" "> > \n" - "> > -\tif ((strncmp(str, \"onmatch(\", sizeof(\"onmatch(\") - 1) =\n" + "> > -\tif ((strncmp(str, \"onmatch(\", sizeof(\"onmatch(\") - 1) ==\n" "> > 0) ||\n" - "> > -\t (strncmp(str, \"onmax(\", sizeof(\"onmax(\") - 1) = 0)) {\n" + "> > -\t (strncmp(str, \"onmax(\", sizeof(\"onmax(\") - 1) == 0)) {\n" "> > +\tif ((str_has_prefix(str, \"onmatch(\")) ||\n" "> > +\t (str_has_prefix(str, \"onmax(\"))) {\n" "> > \t\tattrs->action_str[attrs->n_actions] = kstrdup(str,\n" @@ -81,8 +81,8 @@ "> > {\n" "> > \tint ret = 0;\n" "> > \n" - "> > -\tif ((strncmp(str, \"key=\", sizeof(\"key=\") - 1) = 0) ||\n" - "> > -\t (strncmp(str, \"keys=\", sizeof(\"keys=\") - 1) = 0)) {\n" + "> > -\tif ((strncmp(str, \"key=\", sizeof(\"key=\") - 1) == 0) ||\n" + "> > -\t (strncmp(str, \"keys=\", sizeof(\"keys=\") - 1) == 0)) {\n" "> > +\tif ((str_has_prefix(str, \"key=\")) ||\n" "> > +\t (str_has_prefix(str, \"keys=\"))) {\n" "> > \t\tattrs->keys_str = kstrdup(str, GFP_KERNEL);\n" @@ -90,12 +90,12 @@ "> > \t\t\tret = -ENOMEM;\n" "> > \t\t\tgoto out;\n" "> > \t\t}\n" - "> > -\t} else if ((strncmp(str, \"val=\", sizeof(\"val=\") - 1) = 0)\n" + "> > -\t} else if ((strncmp(str, \"val=\", sizeof(\"val=\") - 1) == 0)\n" "> > ||\n" - "> > -\t\t (strncmp(str, \"vals=\", sizeof(\"vals=\") - 1) = 0)\n" + "> > -\t\t (strncmp(str, \"vals=\", sizeof(\"vals=\") - 1) == 0)\n" "> > ||\n" "> > -\t\t (strncmp(str, \"values=\", sizeof(\"values=\") - 1)\n" - "> > = 0)) {\n" + "> > == 0)) {\n" "> > +\t} else if ((str_has_prefix(str, \"val=\")) ||\n" "> > +\t\t (str_has_prefix(str, \"vals=\")) ||\n" "> > +\t\t (str_has_prefix(str, \"values=\"))) {\n" @@ -104,7 +104,7 @@ "> > \t\t\tret = -ENOMEM;\n" "> > \t\t\tgoto out;\n" "> > \t\t}\n" - "> > -\t} else if (strncmp(str, \"sort=\", sizeof(\"sort=\") - 1) =\n" + "> > -\t} else if (strncmp(str, \"sort=\", sizeof(\"sort=\") - 1) ==\n" "> > 0) {\n" "> > +\t} else if (str_has_prefix(str, \"sort=\")) {\n" "> > \t\tattrs->sort_key_str = kstrdup(str, GFP_KERNEL);\n" @@ -112,7 +112,7 @@ "> > \t\t\tret = -ENOMEM;\n" "> > \t\t\tgoto out;\n" "> > \t\t}\n" - "> > -\t} else if (strncmp(str, \"name=\", sizeof(\"name=\") - 1) =\n" + "> > -\t} else if (strncmp(str, \"name=\", sizeof(\"name=\") - 1) ==\n" "> > 0) {\n" "> > +\t} else if (str_has_prefix(str, \"name=\")) {\n" "> > \t\tattrs->name = kstrdup(str, GFP_KERNEL);\n" @@ -120,7 +120,7 @@ "> > \t\t\tret = -ENOMEM;\n" "> > \t\t\tgoto out;\n" "> > \t\t}\n" - "> > -\t} else if (strncmp(str, \"clock=\", sizeof(\"clock=\") - 1) =\n" + "> > -\t} else if (strncmp(str, \"clock=\", sizeof(\"clock=\") - 1) ==\n" "> > 0) {\n" "> > +\t} else if (str_has_prefix(str, \"clock=\")) {\n" "> > \t\tstrsep(&str, \"=\");\n" @@ -131,7 +131,7 @@ "> > \t\t\tret = -ENOMEM;\n" "> > \t\t\tgoto out;\n" "> > \t\t}\n" - "> > -\t} else if (strncmp(str, \"size=\", sizeof(\"size=\") - 1) =\n" + "> > -\t} else if (strncmp(str, \"size=\", sizeof(\"size=\") - 1) ==\n" "> > 0) {\n" "> > +\t} else if (str_has_prefix(str, \"size=\")) {\n" "> > \t\tint map_bits = parse_map_size(str);\n" @@ -142,7 +142,7 @@ "> > \tif (!onmax_fn_name || !str)\n" "> > \t\tgoto free;\n" "> > \n" - "> > -\tif (strncmp(onmax_fn_name, \"save\", sizeof(\"save\") - 1) =\n" + "> > -\tif (strncmp(onmax_fn_name, \"save\", sizeof(\"save\") - 1) ==\n" "> > 0) {\n" "> > +\tif (str_has_prefix(onmax_fn_name, \"save\")) {\n" "> > \t\tchar *params = strsep(&str, \")\");\n" @@ -154,7 +154,7 @@ "> > \t\tstr = hist_data->attrs->action_str[i];\n" "> > \n" "> > -\t\tif (strncmp(str, \"onmatch(\", sizeof(\"onmatch(\") -\n" - "> > 1) = 0) {\n" + "> > 1) == 0) {\n" "> > +\t\tif (str_has_prefix(str, \"onmatch(\")) {\n" "> > \t\t\tchar *action_str = str +\n" "> > sizeof(\"onmatch(\") - 1;\n" @@ -166,7 +166,7 @@ "> > \t\t\t}\n" "> > \t\t\tdata->fn = action_trace;\n" "> > -\t\t} else if (strncmp(str, \"onmax(\", sizeof(\"onmax(\")\n" - "> > - 1) = 0) {\n" + "> > - 1) == 0) {\n" "> > +\t\t} else if (str_has_prefix(str, \"onmax(\")) {\n" "> > \t\t\tchar *action_str = str + sizeof(\"onmax(\")\n" "> > - 1;\n" @@ -175,4 +175,4 @@ "> \n" > -69d595fd59e128f77f0ccecbec652e5cc51b3fc60647e97671299b262ba104f7 +f7faaddb153da67edaee571fec0b13550fc553973d62646f59307a4295af0067
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.