diff for duplicates of <4BA738D3.1040000@redhat.com> diff --git a/a/1.txt b/N1/1.txt index e4f5a3d..3b0b167 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10); > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > val = SENSORS_LIMIT(val, 23, 1500000); @@ -35,7 +35,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - unsigned long val = simple_strtoul(buf, NULL, 10); > + unsigned long val; > + -> + if (strict_strtoul(buf, 10,&val) = -EINVAL) +> + if (strict_strtoul(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > mutex_lock(&data->update_lock); @@ -47,7 +47,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10) / 8; > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > + val /= 8; @@ -61,7 +61,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - unsigned long val = simple_strtoul(buf, NULL, 10); > + unsigned long val; > + -> + if (strict_strtoul(buf, 10,&val) = -EINVAL) +> + if (strict_strtoul(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > mutex_lock(&data->update_lock); @@ -73,7 +73,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10) / 1000; > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > + val /= 1000; @@ -89,7 +89,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > u8 reg; > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > + val /= 1000; @@ -103,7 +103,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10) / 1000; > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > + val /= 1000; @@ -117,7 +117,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - unsigned long val = simple_strtoul(buf, NULL, 10); > + unsigned long val; > + -> + if (strict_strtoul(buf, 10,&val) = -EINVAL) +> + if (strict_strtoul(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > mutex_lock(&data->update_lock); @@ -129,7 +129,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10); > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > val = SENSORS_LIMIT(val, 0, 255); @@ -142,11 +142,11 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10); > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > /* Special case for F8000 pwm channel 3 which only does auto mode */ -> if (data->type = f8000&& nr = 2&& val != 2) +> if (data->type == f8000&& nr == 2&& val != 2) > @@ -1628,7 +1667,11 @@ static ssize_t store_pwm_auto_point_pwm(struct device *dev, > struct f71882fg_data *data = dev_get_drvdata(dev); > int pwm = to_sensor_dev_attr_2(devattr)->index; @@ -154,7 +154,7 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10); > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > val = SENSORS_LIMIT(val, 0, 255); @@ -168,31 +168,33 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > u8 reg; > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > + val /= 1000; > > mutex_lock(&data->update_lock); -> data->pwm_auto_point_temp[nr][point] > @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev, +> data->pwm_auto_point_temp[nr][point] = +> @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev, > { > struct f71882fg_data *data = dev_get_drvdata(dev); > int nr = to_sensor_dev_attr_2(devattr)->index; > - unsigned long val = simple_strtoul(buf, NULL, 10); > + unsigned long val; > + -> + if (strict_strtoul(buf, 10,&val) = -EINVAL) +> + if (strict_strtoul(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > mutex_lock(&data->update_lock); -> data->pwm_auto_point_mapping[nr] > @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev, +> data->pwm_auto_point_mapping[nr] = +> @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev, > { > struct f71882fg_data *data = dev_get_drvdata(dev); > int nr = to_sensor_dev_attr_2(devattr)->index; > - long val = simple_strtol(buf, NULL, 10); > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > > switch (val) { @@ -204,15 +206,10 @@ On 03/21/2010 04:37 PM, Giel van Schijndel wrote: > - long val = simple_strtol(buf, NULL, 10) / 1000; > + long val; > + -> + if (strict_strtol(buf, 10,&val) = -EINVAL) +> + if (strict_strtol(buf, 10,&val) == -EINVAL) > + return -EINVAL; > + > + val /= 1000; > -> if (data->type = f71889fg) +> if (data->type == f71889fg) > val = SENSORS_LIMIT(val, -128, 127); - -_______________________________________________ -lm-sensors mailing list -lm-sensors@lm-sensors.org -http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index e236b1a..1956ea8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01269185834-10266-1-git-send-email-me@mortis.eu\0" "ref\01269185834-10266-2-git-send-email-me@mortis.eu\0" "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [lm-sensors] [PATCH 2/2] Hwmon: f71882fg: use strict_stro(l|ul)\0" - "Date\0Mon, 22 Mar 2010 09:30:59 +0000\0" + "Subject\0Re: [PATCH 2/2] Hwmon: f71882fg: use strict_stro(l|ul) instead of simple_strto$1\0" + "Date\0Mon, 22 Mar 2010 10:30:59 +0100\0" "To\0Giel van Schijndel <me@mortis.eu>\0" "Cc\0Jean Delvare <khali@linux-fr.org>" Jonathan Cameron <jic23@cam.ac.uk> @@ -35,7 +35,7 @@ "> -\tlong val = simple_strtol(buf, NULL, 10);\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \tval = SENSORS_LIMIT(val, 23, 1500000);\n" @@ -47,7 +47,7 @@ "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n" "> +\tunsigned long val;\n" "> +\n" - "> +\tif (strict_strtoul(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtoul(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \tmutex_lock(&data->update_lock);\n" @@ -59,7 +59,7 @@ "> -\tlong val = simple_strtol(buf, NULL, 10) / 8;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval /= 8;\n" @@ -73,7 +73,7 @@ "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n" "> +\tunsigned long val;\n" "> +\n" - "> +\tif (strict_strtoul(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtoul(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \tmutex_lock(&data->update_lock);\n" @@ -85,7 +85,7 @@ "> -\tlong val = simple_strtol(buf, NULL, 10) / 1000;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval /= 1000;\n" @@ -101,7 +101,7 @@ "> \tu8 reg;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval /= 1000;\n" @@ -115,7 +115,7 @@ "> -\tlong val = simple_strtol(buf, NULL, 10) / 1000;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval /= 1000;\n" @@ -129,7 +129,7 @@ "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n" "> +\tunsigned long val;\n" "> +\n" - "> +\tif (strict_strtoul(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtoul(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \tmutex_lock(&data->update_lock);\n" @@ -141,7 +141,7 @@ "> -\tlong val = simple_strtol(buf, NULL, 10);\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> \tval = SENSORS_LIMIT(val, 0, 255);\n" @@ -154,11 +154,11 @@ "> -\tlong val = simple_strtol(buf, NULL, 10);\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \t/* Special case for F8000 pwm channel 3 which only does auto mode */\n" - "> \tif (data->type = f8000&& nr = 2&& val != 2)\n" + "> \tif (data->type == f8000&& nr == 2&& val != 2)\n" "> @@ -1628,7 +1667,11 @@ static ssize_t store_pwm_auto_point_pwm(struct device *dev,\n" "> \tstruct f71882fg_data *data = dev_get_drvdata(dev);\n" "> \tint pwm = to_sensor_dev_attr_2(devattr)->index;\n" @@ -166,7 +166,7 @@ "> -\tlong val = simple_strtol(buf, NULL, 10);\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> \tval = SENSORS_LIMIT(val, 0, 255);\n" @@ -180,31 +180,33 @@ "> \tu8 reg;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval /= 1000;\n" ">\n" "> \tmutex_lock(&data->update_lock);\n" - "> \tdata->pwm_auto_point_temp[nr][point] > @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev,\n" + "> \tdata->pwm_auto_point_temp[nr][point] =\n" + "> @@ -1717,7 +1765,10 @@ static ssize_t store_pwm_interpolate(struct device *dev,\n" "> {\n" "> \tstruct f71882fg_data *data = dev_get_drvdata(dev);\n" "> \tint nr = to_sensor_dev_attr_2(devattr)->index;\n" "> -\tunsigned long val = simple_strtoul(buf, NULL, 10);\n" "> +\tunsigned long val;\n" "> +\n" - "> +\tif (strict_strtoul(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtoul(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \tmutex_lock(&data->update_lock);\n" - "> \tdata->pwm_auto_point_mapping[nr] > @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,\n" + "> \tdata->pwm_auto_point_mapping[nr] =\n" + "> @@ -1753,7 +1804,10 @@ static ssize_t store_pwm_auto_point_channel(struct device *dev,\n" "> {\n" "> \tstruct f71882fg_data *data = dev_get_drvdata(dev);\n" "> \tint nr = to_sensor_dev_attr_2(devattr)->index;\n" "> -\tlong val = simple_strtol(buf, NULL, 10);\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" ">\n" "> \tswitch (val) {\n" @@ -216,17 +218,12 @@ "> -\tlong val = simple_strtol(buf, NULL, 10) / 1000;\n" "> +\tlong val;\n" "> +\n" - "> +\tif (strict_strtol(buf, 10,&val) = -EINVAL)\n" + "> +\tif (strict_strtol(buf, 10,&val) == -EINVAL)\n" "> +\t\treturn -EINVAL;\n" "> +\n" "> +\tval /= 1000;\n" ">\n" - "> \tif (data->type = f71889fg)\n" - "> \t\tval = SENSORS_LIMIT(val, -128, 127);\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + "> \tif (data->type == f71889fg)\n" + "> \t\tval = SENSORS_LIMIT(val, -128, 127);" -846eeb948747bd4709e23bc24636aa03a6265a0bec32e806364c9f8d23e512d2 +d0d03008bd9d714b2cfcab332ca47f9e60de45a3a04e828e11e7801f1aac7b2e
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.