- more changes (needed on sparc)

Changed files:
    openhpi-align.patch -> 1.4
    openhpi-types.patch -> 1.7

diff --git a/openhpi-align.patch b/openhpi-align.patch
index 866f7760c0aadc6dce120b0900d2490c9cf4060f..2298854afba7e8ed5dc4df9f46835c6857bdcd7a 100644 (file)
--- a/openhpi-align.patch
+++ b/openhpi-align.patch
@@ -249,3 +249,47 @@
                               __set_control_state, info);
  }
  
+--- openhpi-1.0.0/plugins/snmp_rsa/snmp_rsa_inventory.c.orig   2004-04-05 20:59:44.000000000 +0000
++++ openhpi-1.0.0/plugins/snmp_rsa/snmp_rsa_inventory.c        2004-07-31 08:07:00.000000000 +0000
+@@ -374,7 +374,7 @@
+ 
+         l_data = data;
+         l_data->Validity =  SAHPI_INVENT_DATA_INVALID;
+-        l_data->DataRecords[0] = (SaHpiInventDataRecordT *)l_data + sizeof(SaHpiInventoryDataT) +
++        l_data->DataRecords[0] = (SaHpiInventDataRecordT *)(void*)l_data + sizeof(SaHpiInventoryDataT) +
+                                         sizeof(l_data->DataRecords[0])+  sizeof(SaHpiInventDataRecordT);
+         l_data->DataRecords[1] = NULL;
+ 
+--- openhpi-1.0.0/plugins/snmp_rsa/t/snmp_rsa_inventory.c.orig 2004-04-05 20:59:44.000000000 +0000
++++ openhpi-1.0.0/plugins/snmp_rsa/t/snmp_rsa_inventory.c      2004-07-31 07:37:06.000000000 +0000
+@@ -374,7 +374,7 @@
+ 
+         l_data = data;
+         l_data->Validity =  SAHPI_INVENT_DATA_INVALID;
+-        l_data->DataRecords[0] = (SaHpiInventDataRecordT *)l_data + sizeof(SaHpiInventoryDataT) +
++        l_data->DataRecords[0] = (SaHpiInventDataRecordT *)(void*)l_data + sizeof(SaHpiInventoryDataT) +
+                                         sizeof(l_data->DataRecords[0])+  sizeof(SaHpiInventDataRecordT);
+         l_data->DataRecords[1] = NULL;
+ 
+--- openhpi-1.0.0/plugins/snmp_bc/snmp_bc_inventory.c.orig     2004-06-21 14:37:30.000000000 +0000
++++ openhpi-1.0.0/plugins/snmp_bc/snmp_bc_inventory.c  2004-07-31 08:26:11.000000000 +0000
+@@ -361,7 +361,7 @@
+         struct oh_handler_state *handle = (struct oh_handler_state *)hnd;\r
+         SaHpiRdrT *rdr = oh_get_rdr_by_type(handle->rptcache, id, SAHPI_INVENTORY_RDR, num);\r
+ \r
+-        l_data = (struct snmp_bc_inventory_data *) data;\r
++        l_data = (struct snmp_bc_inventory_data *) (void*)data;\r
+         l_data->Validity =  SAHPI_INVENT_DATA_INVALID;\r
+                 \r
+         /* Currently supporting only one data record */\r
+--- openhpi-1.0.0/plugins/snmp_bc/t/snmp_bc_inventory.c.orig   2004-06-21 14:37:30.000000000 +0000
++++ openhpi-1.0.0/plugins/snmp_bc/t/snmp_bc_inventory.c        2004-07-31 08:17:28.000000000 +0000
+@@ -361,7 +361,7 @@
+         struct oh_handler_state *handle = (struct oh_handler_state *)hnd;\r
+         SaHpiRdrT *rdr = oh_get_rdr_by_type(handle->rptcache, id, SAHPI_INVENTORY_RDR, num);\r
+ \r
+-        l_data = (struct snmp_bc_inventory_data *) data;\r
++        l_data = (struct snmp_bc_inventory_data *) (void*)data;\r
+         l_data->Validity =  SAHPI_INVENT_DATA_INVALID;\r
+                 \r
+         /* Currently supporting only one data record */\r

diff --git a/openhpi-types.patch b/openhpi-types.patch
index 64a866beddabc2a095128cc79eff57456a72548a..831e2b05616cb63b13285c29bc36129efdb69d30 100644 (file)
--- a/openhpi-types.patch
+++ b/openhpi-types.patch
@@ -134,3 +134,14 @@
                if (rv != SA_OK)
                        printf("discovery failed\n");
  
+--- openhpi-1.0.0/openhpid/event_get.c.orig    2004-04-05 07:52:32.000000000 +0000
++++ openhpi-1.0.0/openhpid/event_get.c 2004-07-31 08:34:36.000000000 +0000
+@@ -54,7 +54,7 @@
+   // 11:11:11
+   strftime( b, 10, "%H:%M:%S", &tmt );
+ 
+-  sprintf( b + 9 - 1, ".%03ld ", tv.tv_usec / 1000 );
++  sprintf( b + 9 - 1, ".%03ld ", (long)(tv.tv_usec / 1000) );
+ 
+   va_list ap;
+   va_start( ap, fmt );