* [gentoo-commits] gentoo-x86 commit in sys-apps/lm_sensors/files: lm_sensors-3.1.2-changeset_r5835.patch
@ 2010-06-27 18:48 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-06-27 18:48 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/06/27 18:48:46
Added: lm_sensors-3.1.2-changeset_r5835.patch
Log:
Fix support of multiple chips wrt #325083 by Horst Prote.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch?rev=1.1&content-type=text/plain
Index: lm_sensors-3.1.2-changeset_r5835.patch
===================================================================
http://bugs.gentoo.org/325083
http://www.lm-sensors.org/changeset/5835
--- prog/sensord/rrd.c
+++ prog/sensord/rrd.c
@@ -138,7 +138,9 @@
}
+/* Returns the number of features processed, or -1 on error */
static int _applyToFeatures(FeatureFN fn, void *data,
const sensors_chip_name *chip,
- const ChipDescriptor *desc)
+ const ChipDescriptor *desc,
+ int labelOffset)
{
int i;
@@ -148,5 +150,5 @@
char *label;
- for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
+ for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
feature = features + i;
rawLabel = feature->feature->name;
@@ -159,9 +161,9 @@
}
- rrdCheckLabel(rawLabel, i);
- fn(data, rrdLabels[i], label, feature);
+ rrdCheckLabel(rawLabel, labelOffset + i);
+ fn(data, rrdLabels[labelOffset + i], label, feature);
free(label);
}
- return 0;
+ return i;
}
@@ -185,5 +187,5 @@
static int applyToFeatures(FeatureFN fn, void *data)
{
- int i, i_detected, ret;
+ int i, i_detected, ret, labelOffset = 0;
const sensors_chip_name *chip, *chip_arg;
ChipDescriptor *desc;
@@ -198,7 +200,8 @@
continue;
- ret = _applyToFeatures(fn, data, chip, desc);
- if (ret)
+ ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
+ if (ret < 0)
return ret;
+ labelOffset += ret;
}
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/lm_sensors/files: lm_sensors-3.1.2-changeset_r5835.patch
@ 2010-06-28 6:30 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-06-28 6:30 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/06/28 06:30:51
Modified: lm_sensors-3.1.2-changeset_r5835.patch
Log:
reroll the patch because of CRs and patch-2.5.9 sucking, also upstream trac sucks
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch?r1=1.1&r2=1.2
Index: lm_sensors-3.1.2-changeset_r5835.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lm_sensors-3.1.2-changeset_r5835.patch 27 Jun 2010 18:48:45 -0000 1.1
+++ lm_sensors-3.1.2-changeset_r5835.patch 28 Jun 2010 06:30:51 -0000 1.2
@@ -1,54 +1,61 @@
-http://bugs.gentoo.org/325083
-http://www.lm-sensors.org/changeset/5835
-
---- prog/sensord/rrd.c
-+++ prog/sensord/rrd.c
-@@ -138,7 +138,9 @@
- }
-
-+/* Returns the number of features processed, or -1 on error */
- static int _applyToFeatures(FeatureFN fn, void *data,
- const sensors_chip_name *chip,
-- const ChipDescriptor *desc)
-+ const ChipDescriptor *desc,
-+ int labelOffset)
- {
- int i;
-@@ -148,5 +150,5 @@
- char *label;
-
-- for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
-+ for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
- feature = features + i;
- rawLabel = feature->feature->name;
-@@ -159,9 +161,9 @@
- }
-
-- rrdCheckLabel(rawLabel, i);
-- fn(data, rrdLabels[i], label, feature);
-+ rrdCheckLabel(rawLabel, labelOffset + i);
-+ fn(data, rrdLabels[labelOffset + i], label, feature);
- free(label);
- }
-- return 0;
-+ return i;
- }
-
-@@ -185,5 +187,5 @@
- static int applyToFeatures(FeatureFN fn, void *data)
- {
-- int i, i_detected, ret;
-+ int i, i_detected, ret, labelOffset = 0;
- const sensors_chip_name *chip, *chip_arg;
- ChipDescriptor *desc;
-@@ -198,7 +200,8 @@
- continue;
-
-- ret = _applyToFeatures(fn, data, chip, desc);
-- if (ret)
-+ ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
-+ if (ret < 0)
- return ret;
-+ labelOffset += ret;
- }
- }
+--- prog/sensord/rrd.c
++++ prog/sensord/rrd.c
+@@ -137,9 +137,11 @@
+ }
+ }
+
++/* Returns the number of features processed, or -1 on error */
+ static int _applyToFeatures(FeatureFN fn, void *data,
+ const sensors_chip_name *chip,
+- const ChipDescriptor *desc)
++ const ChipDescriptor *desc,
++ int labelOffset)
+ {
+ int i;
+ const FeatureDescriptor *features = desc->features;
+@@ -147,7 +149,7 @@
+ const char *rawLabel;
+ char *label;
+
+- for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
++ for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
+ feature = features + i;
+ rawLabel = feature->feature->name;
+
+@@ -158,11 +160,11 @@
+ return -1;
+ }
+
+- rrdCheckLabel(rawLabel, i);
+- fn(data, rrdLabels[i], label, feature);
++ rrdCheckLabel(rawLabel, labelOffset + i);
++ fn(data, rrdLabels[labelOffset + i], label, feature);
+ free(label);
+ }
+- return 0;
++ return i;
+ }
+
+ static ChipDescriptor *lookup_known_chips(const sensors_chip_name *chip)
+@@ -184,7 +186,7 @@
+
+ static int applyToFeatures(FeatureFN fn, void *data)
+ {
+- int i, i_detected, ret;
++ int i, i_detected, ret, labelOffset = 0;
+ const sensors_chip_name *chip, *chip_arg;
+ ChipDescriptor *desc;
+
+@@ -197,9 +199,10 @@
+ if (!desc)
+ continue;
+
+- ret = _applyToFeatures(fn, data, chip, desc);
+- if (ret)
++ ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
++ if (ret < 0)
+ return ret;
++ labelOffset += ret;
+ }
+ }
+ return 0;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/lm_sensors/files: lm_sensors-3.1.2-changeset_r5835.patch
@ 2011-03-25 20:54 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-03-25 20:54 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/03/25 20:54:46
Removed: lm_sensors-3.1.2-changeset_r5835.patch
Log:
old
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-25 20:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-28 6:30 [gentoo-commits] gentoo-x86 commit in sys-apps/lm_sensors/files: lm_sensors-3.1.2-changeset_r5835.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2011-03-25 20:54 Samuli Suominen (ssuominen)
2010-06-27 18:48 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox