From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OSwuP-0000v0-KW for garchives@archives.gentoo.org; Sun, 27 Jun 2010 18:48:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80789E0DE3; Sun, 27 Jun 2010 18:48:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5F405E0DE3 for ; Sun, 27 Jun 2010 18:48:47 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01C441B411D for ; Sun, 27 Jun 2010 18:48:47 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2166) id 1F58E2CF96; Sun, 27 Jun 2010 18:48:46 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/lm_sensors/files: lm_sensors-3.1.2-changeset_r5835.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: lm_sensors-3.1.2-changeset_r5835.patch X-VCS-Directories: sys-apps/lm_sensors/files X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20100627184846.1F58E2CF96@corvid.gentoo.org> Date: Sun, 27 Jun 2010 18:48:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f1a3b229-accd-4b37-8ffd-ffe6dc69082f X-Archives-Hash: 76439c8e1fbfc25c02f17313d22579db 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_sensor= s/files/lm_sensors-3.1.2-changeset_r5835.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lm_sensor= s/files/lm_sensors-3.1.2-changeset_r5835.patch?rev=3D1.1&content-type=3Dt= ext/plain Index: lm_sensors-3.1.2-changeset_r5835.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D http://bugs.gentoo.org/325083 http://www.lm-sensors.org/changeset/5835 --- prog/sensord/rrd.c +++ prog/sensord/rrd.c @@ -138,7 +138,9 @@ } =20 +/* 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; =20 - for (i =3D 0; i < MAX_RRD_SENSORS && features[i].format; ++i) { + for (i =3D 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; = ++i) { feature =3D features + i; rawLabel =3D feature->feature->name; @@ -159,9 +161,9 @@ } =20 - 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; } =20 @@ -185,5 +187,5 @@ static int applyToFeatures(FeatureFN fn, void *data) { - int i, i_detected, ret; + int i, i_detected, ret, labelOffset =3D 0; const sensors_chip_name *chip, *chip_arg; ChipDescriptor *desc; @@ -198,7 +200,8 @@ continue; =20 - ret =3D _applyToFeatures(fn, data, chip, desc); - if (ret) + ret =3D _applyToFeatures(fn, data, chip, desc, labelOffset); + if (ret < 0) return ret; + labelOffset +=3D ret; } }