| 1 |
ssuominen 10/06/27 18:48:46 |
| 2 |
|
| 3 |
Added: lm_sensors-3.1.2-changeset_r5835.patch |
| 4 |
Log: |
| 5 |
Fix support of multiple chips wrt #325083 by Horst Prote. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch |
| 10 |
|
| 11 |
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 |
| 12 |
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 |
| 13 |
|
| 14 |
Index: lm_sensors-3.1.2-changeset_r5835.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/325083 |
| 17 |
http://www.lm-sensors.org/changeset/5835 |
| 18 |
|
| 19 |
--- prog/sensord/rrd.c |
| 20 |
+++ prog/sensord/rrd.c |
| 21 |
@@ -138,7 +138,9 @@ |
| 22 |
} |
| 23 |
|
| 24 |
+/* Returns the number of features processed, or -1 on error */ |
| 25 |
static int _applyToFeatures(FeatureFN fn, void *data, |
| 26 |
const sensors_chip_name *chip, |
| 27 |
- const ChipDescriptor *desc) |
| 28 |
+ const ChipDescriptor *desc, |
| 29 |
+ int labelOffset) |
| 30 |
{ |
| 31 |
int i; |
| 32 |
@@ -148,5 +150,5 @@ |
| 33 |
char *label; |
| 34 |
|
| 35 |
- for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) { |
| 36 |
+ for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) { |
| 37 |
feature = features + i; |
| 38 |
rawLabel = feature->feature->name; |
| 39 |
@@ -159,9 +161,9 @@ |
| 40 |
} |
| 41 |
|
| 42 |
- rrdCheckLabel(rawLabel, i); |
| 43 |
- fn(data, rrdLabels[i], label, feature); |
| 44 |
+ rrdCheckLabel(rawLabel, labelOffset + i); |
| 45 |
+ fn(data, rrdLabels[labelOffset + i], label, feature); |
| 46 |
free(label); |
| 47 |
} |
| 48 |
- return 0; |
| 49 |
+ return i; |
| 50 |
} |
| 51 |
|
| 52 |
@@ -185,5 +187,5 @@ |
| 53 |
static int applyToFeatures(FeatureFN fn, void *data) |
| 54 |
{ |
| 55 |
- int i, i_detected, ret; |
| 56 |
+ int i, i_detected, ret, labelOffset = 0; |
| 57 |
const sensors_chip_name *chip, *chip_arg; |
| 58 |
ChipDescriptor *desc; |
| 59 |
@@ -198,7 +200,8 @@ |
| 60 |
continue; |
| 61 |
|
| 62 |
- ret = _applyToFeatures(fn, data, chip, desc); |
| 63 |
- if (ret) |
| 64 |
+ ret = _applyToFeatures(fn, data, chip, desc, labelOffset); |
| 65 |
+ if (ret < 0) |
| 66 |
return ret; |
| 67 |
+ labelOffset += ret; |
| 68 |
} |
| 69 |
} |
Archives