Author: qboosh Date: Mon Feb 28 06:48:32 2005 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated for 2.0.2
---- Files affected:
SOURCES:
openhpi-types.patch (1.7.2.1 -> 1.7.2.2)
---- Diffs:
================================================================
Index: SOURCES/openhpi-types.patch
diff -u SOURCES/openhpi-types.patch:1.7.2.1 SOURCES/openhpi-types.patch:1.7.2.2
--- SOURCES/openhpi-types.patch:1.7.2.1 Sat Jan 22 00:52:22 2005
+++ SOURCES/openhpi-types.patch Mon Feb 28 07:48:27 2005
@@ -1,62 +1,3 @@
---- openhpi-0.7.0/plugins/snmp_client/snmp_client_get_rdrs.c.orig
2004-02-22 02:28:11.000000000 +0000
-+++ openhpi-0.7.0/plugins/snmp_client/snmp_client_get_rdrs.c 2004-02-22
03:10:15.000000000 +0000
-@@ -317,9 +317,8 @@
- if (vars->type == ASN_OCTET_STR) {
-
- /* local variables used by case statements */
-- int *data;
-+ int data; /* 32-bit */
- char *repeat;
-- int *stream_data;
- char *text_info;
- char *oem_data;
-
-@@ -339,18 +338,12 @@
-
ntohl(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Discrete.Default);
- break;
- case SAHPI_CTRL_TYPE_ANALOG:
-- data = (int *)(void
*)vars->val.string;
--
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Min = *data;
--
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Min =
--
ntohl(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Min);
-- data++;
--
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Max = *data;
--
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Max =
--
ntohl(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Max);
-- data++;
--
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Default = *data;
--
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Default =
--
ntohl(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Default);
-+ memcpy(&data, vars->val.string,
sizeof(int));
-+
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Min = ntohl(data);
-+ memcpy(&data, vars->val.string +
sizeof(int), sizeof(int));
-+
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Max = ntohl(data);
-+ memcpy(&data, vars->val.string +
2*sizeof(int), sizeof(int));
-+
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Analog.Default = ntohl(data);
- break;
- case SAHPI_CTRL_TYPE_STREAM:
- /* set repeat */
-@@ -359,17 +352,16 @@
- repeat,
-
sizeof(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Stream.Default.Repeat));
- repeat++;
-- stream_data = (int *)(void *)repeat;
- /* set .StreamLength */
-
memcpy(&sahpi_ctr_cap[i].CtrlRec.TypeUnion.Stream.Default.StreamLength,
-- stream_data,
-+ repeat,
-
sizeof(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Stream.Default.StreamLength));
-
sahpi_ctr_cap[i].CtrlRec.TypeUnion.Stream.Default.StreamLength =
-
ntohs(sahpi_ctr_cap[i].CtrlRec.TypeUnion.Stream.Default.StreamLength);
-- stream_data++;
-+ repeat += sizeof(int);
- /* set the .Stream data */
-
memcpy(&sahpi_ctr_cap[i].CtrlRec.TypeUnion.Stream.Default.Stream,
-- stream_data,
-+ repeat,
- SAHPI_CTRL_MAX_STREAM_LENGTH);
- break;
- case SAHPI_CTRL_TYPE_TEXT:
--- openhpi-0.7.0/plugins/ipmidirect/ipmi.cpp.orig 2004-02-04
03:15:11.000000000 +0000
+++ openhpi-0.7.0/plugins/ipmidirect/ipmi.cpp 2004-02-22 13:36:05.000000000
+0000
@@ -908,7 +908,8 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/openhpi-types.patch?r1=1.7.2.1&r2=1.7.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
