Fix assorted build problems. Should close PR 42081. While here, add at
least minimal comments to all patches and tidy up some (but by no
means all) pkglint.

I have no idea if this works. It spews warnings about "packed", which
lead me to suspect it may not run correctly, but I don't have the
facilities to test it. It does, however, now build ok on LP64 and if
someone can test it may be reasonable to remove the restriction on that.


(dholland)

$NetBSD: patch-dpteng_connect_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dpteng/connect.hpp~	2002-08-13 15:02:20.000000000 +0000
+++ dpteng/connect.hpp
@@ -167,7 +167,7 @@ public:
 
 // Constructor/Destructor.............................
 
-			dptSCSIcon_C::dptSCSIcon_C();
+			dptSCSIcon_C();
 
 // Message Handlers...................................
 

$NetBSD: patch-dpteng_debug_h,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dpteng/debug.h~	2002-08-13 15:02:21.000000000 +0000
+++ dpteng/debug.h
@@ -4,11 +4,11 @@
 #include "osd_defs.h"
 
 #ifndef _DPT_NETWARE
-#include <fstream.h>
-#include <iostream.h>
-#include <iomanip.h>
-#include <string.h>
-#include <stdio.h>
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <cstring>
+#include <cstdio>
 #endif
 
 

$NetBSD: patch-dpteng_device_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

gcc apparently won't accept passing a packed field by reference
nowadays.

--- dpteng/device.cpp~	2002-08-13 15:02:21.000000000 +0000
+++ dpteng/device.cpp
@@ -4048,7 +4048,15 @@ if (bytesLeft >= bytesNeeded) {
 	// Return this object's manager SCSI ID instead of tag
       basic_P->attachedTo = myMgr_P()->getAddrL();
 	// Reverse the SCSI address bytes
-      reverseBytes(basic_P->attachedTo);
+      {
+	 /*
+	  * dholland 20110522 gcc apparently won't accept passing a
+	  * packed field by reference nowadays.
+	  */
+	 uLONG tmp = basic_P->attachedTo;
+	 reverseBytes(tmp);
+	 basic_P->attachedTo = tmp;
+      }
    }
      // Return the component list size
    fromEng_P->insert(compSize);

$NetBSD: patch-dpteng_lockunix_c,v 1.1 2011/05/22 19:11:42 dholland Exp $

- Avoid mktemp.
- Pass a file mode to open when creating files.

Note that dpteng/lockunix.c and dptutil/lockunix.c are identical and
should be patched identically.

--- dpteng/lockunix.c.orig	2002-08-13 15:02:26.000000000 +0000
+++ dpteng/lockunix.c
@@ -73,7 +73,7 @@ MkLock (char * name)
 		return (-1);
 	}
 	sprintf (templateBuffer, Template, Name);
-	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
+	if ((fd = mkstemp (templateBuffer)) < 0) {
 		free (templateBuffer);
 		free (lock);
 		return (-1);
@@ -143,7 +143,7 @@ ChLock (char * name, int pid)
 
 	if (lock != (char *)NULL) {
 		sprintf (lock, Lock, Name);
-	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC)) >= 0) {
+	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC, 0600)) >= 0) {
 			sprintf (buffer, "%d\n", pid);
 			write (fd, buffer, strlen(buffer));
 			close (fd);

$NetBSD: patch-dpteng_raid_h,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dpteng/raid.h~	2002-08-13 15:02:27.000000000 +0000
+++ dpteng/raid.h
@@ -249,7 +249,7 @@ struct raidDef_S : public raidDefinition
 
 // Constructor/Destructor.............................
 
-			raidDef_S::raidDef_S();
+			raidDef_S();
 
 };
 #endif  // c++

$NetBSD: patch-dpteng_scsi__obj_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

gcc apparently won't accept passing a packed field by reference
nowadays.

--- dpteng/scsi_obj.cpp~	2002-08-13 15:02:28.000000000 +0000
+++ dpteng/scsi_obj.cpp
@@ -421,7 +421,15 @@ if (bytesLeft >= (infoSize()+sizeof(uLON
 	// Return this object's manager SCSI ID instead of tag
       basic_P->attachedTo = myMgr_P()->getAddrL();
 	// Reverse the SCSI address bytes
-      reverseBytes(basic_P->attachedTo);
+      {
+	 /*
+	  * dholland 20110522 gcc apparently won't accept passing a
+	  * packed field by reference nowadays.
+	  */
+	 uLONG tmp = basic_P->attachedTo;
+	 reverseBytes(tmp);
+	 basic_P->attachedTo = tmp;
+      }
 
    DEBUG(6, PRT_SADDR(basic_P) << "new attachedTo=0x" << hex << \
 	    basic_P->attachedTo << " is set");

$NetBSD: patch-dptutil_alarm_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/alarm.hpp~	2002-08-13 15:02:44.000000000 +0000
+++ dptutil/alarm.hpp
@@ -32,7 +32,7 @@ enum AlarmCommand { None, On, Off, Enabl
 class AlarmStatus:public Command
 	{
 	public:
-		AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );							
+		AlarmStatus( int hba, AlarmCommand cmd );							
 		AlarmStatus( const AlarmStatus &new_AlarmStatus );
 		virtual	~AlarmStatus();
 		AlarmStatus	&operator = ( AlarmStatus &right );

$NetBSD: patch-dptutil_dynsize_h,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/dynsize.h.orig	2002-08-13 15:02:46.000000000 +0000
+++ dptutil/dynsize.h
@@ -22,8 +22,11 @@
 *****************************************************************************/
 
 /*** INCLUDES ***/
-#include <iostream.h>
-#include <stdio.h>
+#include <iostream>
+#include <cstdio>
+using std::ios;
+using std::istream;
+using std::streambuf;
 
 
 /*** DEFINES ***/

$NetBSD: patch-dptutil_engiface_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/engiface.cpp~	2002-08-13 15:02:46.000000000 +0000
+++ dptutil/engiface.cpp
@@ -26,7 +26,7 @@
 #include "id_list.hpp"
 #include "dpt_api.h"
 
-extern "C" uLONG engineTimeOut = 0;
+uLONG engineTimeOut = 0;
 
 //Function - DPT_EngineIO_C::DPT_EngineIO_C() - start
 //===========================================================================

$NetBSD: patch-dptutil_engiface_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/engiface.hpp~	2002-08-13 15:02:46.000000000 +0000
+++ dptutil/engiface.hpp
@@ -33,7 +33,7 @@
 #include       "id_list.hpp"
 
 
-extern "C" uLONG engineTimeOut;
+extern uLONG engineTimeOut;
 
 
 //class - DPT_EngineIO_C - start

$NetBSD: patch-dptutil_eventlog_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/eventlog.hpp~	2002-08-13 15:02:47.000000000 +0000
+++ dptutil/eventlog.hpp
@@ -51,7 +51,7 @@ class EventLog:public Command
 	{
 
 	public:
-		EventLog::EventLog(SCSI_Addr_List *deviceList, 
+		EventLog(SCSI_Addr_List *deviceList, 
             EventLogOptions cmd);
 		EventLog(const EventLog &new_EventLog);
 		virtual	~EventLog();

$NetBSD: patch-dptutil_expand_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/expand.hpp~	2002-08-13 15:02:47.000000000 +0000
+++ dptutil/expand.hpp
@@ -29,7 +29,7 @@
 class Expand:public Command
 {
    public:
-      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
+      Expand (SCSI_Address raid, SCSI_Addr_List *list);
 		Expand (const Expand &new_Expand);
 		virtual ~Expand();
 		Expand &operator = (Expand &right);

$NetBSD: patch-dptutil_flash_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/flash.cpp.orig	2002-08-13 15:02:47.000000000 +0000
+++ dptutil/flash.cpp
@@ -31,12 +31,10 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <fstream.h>
-#if defined _DPT_WIN_NT
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include <fstream>
+//#include <strstream>
+using std::fstream;
+using std::ios;
 
 extern char* EventStrings[];
 /*** CONSTANTS ***/

$NetBSD: patch-dptutil_flash_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/flash.hpp~	2002-08-13 15:02:47.000000000 +0000
+++ dptutil/flash.hpp
@@ -21,7 +21,8 @@
 *****************************************************************************/
 
 /*** INCLUDES ***/
-#include <iostream.h>
+#include <iostream>
+using std::istream;
 /*** CONSTANTS ***/
 enum FlashRegion { FW, I2OBIOS, SMOR, NVRAM };
 

$NetBSD: patch-dptutil_forcest_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/forcest.hpp~	2002-08-13 15:02:47.000000000 +0000
+++ dptutil/forcest.hpp
@@ -39,7 +39,7 @@ enum ForceStateOptions { Optimal, Fail, 
 class ForceState:public Command
 	{
 	public:
-		ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
+		ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
 		ForceState(const ForceState &new_ForceState);
 		virtual	~ForceState();
 

$NetBSD: patch-dptutil_listdev_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/listdev.cpp~	2002-08-13 15:02:48.000000000 +0000
+++ dptutil/listdev.cpp
@@ -1896,7 +1896,7 @@ void List_Device::GetSmorBiosSignatures(
     // Save some data from the engine (I have no idea what this data is).
     //
     size_t saveSize = engine->fromEng_P->allocSize + sizeof(dptData_S) - 1;
-    void *saveData = new char[saveSize];
+    char *saveData = new char[saveSize];
     if ( saveData != NULL )
     {
         memcpy(saveData, engine->fromEng_P, saveSize);

$NetBSD: patch-dptutil_lockunix_c,v 1.1 2011/05/22 19:11:42 dholland Exp $

- Avoid mktemp.
- Pass a file mode to open when creating files.

Note that dpteng/lockunix.c and dptutil/lockunix.c are identical and
should be patched identically.

--- dptutil/lockunix.c.orig	2002-08-13 15:02:26.000000000 +0000
+++ dptutil/lockunix.c
@@ -73,7 +73,7 @@ MkLock (char * name)
 		return (-1);
 	}
 	sprintf (templateBuffer, Template, Name);
-	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
+	if ((fd = mkstemp (templateBuffer)) < 0) {
 		free (templateBuffer);
 		free (lock);
 		return (-1);
@@ -143,7 +143,7 @@ ChLock (char * name, int pid)
 
 	if (lock != (char *)NULL) {
 		sprintf (lock, Lock, Name);
-	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC)) >= 0) {
+	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC, 0600)) >= 0) {
 			sprintf (buffer, "%d\n", pid);
 			write (fd, buffer, strlen(buffer));
 			close (fd);

$NetBSD: patch-dptutil_namarray_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/namarray.hpp~	2002-08-13 15:02:49.000000000 +0000
+++ dptutil/namarray.hpp
@@ -32,7 +32,7 @@ class NameArray:public Command
 {
 
 	public:
-		NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
+		NameArray(SCSI_Address arrayToName, char *arrayName);
 		NameArray(const NameArray &new_NameArray);
 		virtual	~NameArray();
 

$NetBSD: patch-dptutil_rmwflash_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/rmwflash.hpp~	2002-08-13 15:02:50.000000000 +0000
+++ dptutil/rmwflash.hpp
@@ -33,7 +33,7 @@ class RMWFlash:public Command
 {
 
         public:
-                RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
+                RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
                 RMWFlash(const RMWFlash &new_RMWFlash);
                 virtual ~RMWFlash();
 

$NetBSD: patch-dptutil_segment_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/segment.hpp~	2002-08-13 15:02:51.000000000 +0000
+++ dptutil/segment.hpp
@@ -23,7 +23,7 @@ class arraySegment:public Command
 {
 
 	public:
-		arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
+		arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
 		arraySegment(const arraySegment &new_arraySegment);
 		virtual	~arraySegment();
 

$NetBSD: patch-dptutil_setcache_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/setcache.hpp~	2002-08-13 15:02:51.000000000 +0000
+++ dptutil/setcache.hpp
@@ -29,7 +29,7 @@
 class SetCache:public Command
 	{
 	public:
-		SetCache::SetCache(
+		SetCache(
 				SCSI_Addr_List	*addresses,		// a list of addresses
 				int				on,				// Whether to enable or disable
 				int				rw				// Read or write cacheing.

$NetBSD: patch-dptutil_setrate_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/setrate.hpp~	2002-08-13 15:02:51.000000000 +0000
+++ dptutil/setrate.hpp
@@ -33,8 +33,8 @@ class SetRate: public Command
 	public:
 
 		// Set the (global) rebuild rate
-        SetRate::SetRate(int rate, SCSI_Addr_List *objs);
-        SetRate::SetRate(const SetRate &right);
+        SetRate(int rate, SCSI_Addr_List *objs);
+        SetRate(const SetRate &right);
 		virtual	~SetRate();
 
 		Dpt_Error execute(String_List **output);

$NetBSD: patch-dptutil_setscfg_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/setscfg.hpp~	2002-08-13 15:02:51.000000000 +0000
+++ dptutil/setscfg.hpp
@@ -33,7 +33,7 @@ class setscfg:public Command
 {
 
 	public:
-		setscfg::setscfg();
+		setscfg();
 		virtual	~setscfg();
 
 		Dpt_Error execute(String_List **output);

$NetBSD: patch-dptutil_taskctrl_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/taskctrl.hpp~	2002-08-13 15:02:52.000000000 +0000
+++ dptutil/taskctrl.hpp
@@ -33,7 +33,7 @@ enum TaskCommandOptions { List, Build, R
 class TaskControl:public Command
 	{
 	public:
-		TaskControl::TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
+		TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
 		TaskControl(const TaskControl &new_TaskControl);
 		virtual	~TaskControl();
 

$NetBSD: patch-dptutil_uartdmp_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/uartdmp.hpp~	2002-08-13 15:02:52.000000000 +0000
+++ dptutil/uartdmp.hpp
@@ -33,7 +33,7 @@ class UartDmp:public Command
 {
 
 	public:
-		UartDmp::UartDmp(int hbaNo, char *fileName);
+		UartDmp(int hbaNo, char *fileName);
 		UartDmp(const UartDmp &new_UartDmp);
 		virtual	~UartDmp();
 

$NetBSD: patch-dptutil_zap_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $

Build fix for semi-modern C++.

--- dptutil/zap.hpp~	2002-08-13 15:02:53.000000000 +0000
+++ dptutil/zap.hpp
@@ -29,7 +29,7 @@
 class Zap:public Command
 	{
 	public:
-		Zap::Zap(
+		Zap(
 				SCSI_Addr_List	*addresses,  // a list of addresses
             int resync = 0            // (send reset to hba or not)
       );								         // to delete raid tables on