Merge pull request #38 from MichaelJCaruso/release-8.0.x

Release 8.0.1 Staging Populated
vision-dbms · Jan 4, 2018 · e4c4c22 · e4c4c22
2 parents 568e332 + 419fa78
commit e4c4c22
Show file tree

Hide file tree

Showing 95 changed files with 658 additions and 514 deletions.
diff --git a/software/src/master/src/M_Darwin/make.cc b/software/src/master/src/M_Darwin/make.cc
@@ -18,7 +18,7 @@ D	=
 
 CDEFS	=  -DVisionBuild
 CINCS	=
-CBASE	= -fexceptions -frtti -Wno-trigraphs -Wno-undefined-bool-conversion -Wno-format -Wno-logical-op-parentheses -Wno-switch -Wno-shift-op-parentheses -Wno-shift-negative-value -Wno-parentheses -Wno-deprecated-declarations
+CBASE	= -fexceptions -frtti -Wno-trigraphs -Wno-undefined-bool-conversion -Wno-logical-op-parentheses -Wno-switch -Wno-shift-op-parentheses -Wno-shift-negative-value -Wno-parentheses -Wno-deprecated-declarations
 CDBG	= -g -fno-limit-debug-info
 CREL	= -O2
 CVER	= ${CREL}

diff --git a/software/src/master/src/M_Darwin/make.cc.lib b/software/src/master/src/M_Darwin/make.cc.lib
@@ -20,7 +20,7 @@ D	=
 
 CDEFS	= 
 CINCS	=
-CBASE	= -fexceptions -frtti -Wno-trigraphs -fPIC -Wno-undefined-bool-conversion -Wno-format -Wno-logical-op-parentheses -Wno-switch -Wno-shift-op-parentheses -Wno-shift-negative-value -Wno-parentheses -Wno-deprecated-declarations
+CBASE	= -fexceptions -frtti -Wno-trigraphs -fPIC -Wno-undefined-bool-conversion -Wno-logical-op-parentheses -Wno-switch -Wno-shift-op-parentheses -Wno-shift-negative-value -Wno-parentheses -Wno-deprecated-declarations
 CDBG	= -g -fno-limit-debug-info
 CREL	= -O2
 CVER	= ${CREL}

diff --git a/software/src/master/src/M_Linux/make.gcc b/software/src/master/src/M_Linux/make.gcc
@@ -18,7 +18,7 @@ D	=
 
 CDEFS	=  -DVisionBuild
 CINCS	=
-CBASE	= -fexceptions -frtti -Wno-trigraphs -g
+CBASE	= -g -fexceptions -frtti -Wall -Wno-array-bounds -Wno-char-subscripts -Wno-delete-non-virtual-dtor -Wno-maybe-uninitialized -Wno-parentheses -Wno-reorder -Wno-return-type -Wno-strict-aliasing -Wno-sign-compare -Wno-switch -Wno-trigraphs -Wno-unused-but-set-variable -Wno-unused-function -Wno-unused-value -Wno-unused-variable -Wno-misleading-indentation
 CDBG	= 
 CREL	= -O2 -U_FORTIFY_SOURCE
 CVER	= ${CREL}

diff --git a/software/src/master/src/M_Linux/make.gcc.lib b/software/src/master/src/M_Linux/make.gcc.lib
@@ -20,7 +20,7 @@ D	=
 
 CDEFS	= 
 CINCS	=
-CBASE	= -fexceptions -frtti -Wno-trigraphs -fPIC -g
+CBASE	= -g -fPIC -fexceptions -frtti -Wall -Wno-array-bounds -Wno-char-subscripts -Wno-delete-non-virtual-dtor -Wno-maybe-uninitialized -Wno-parentheses -Wno-return-type -Wno-reorder -Wno-strict-aliasing -Wno-sign-compare -Wno-switch -Wno-trigraphs -Wno-unused-but-set-variable -Wno-unused-function -Wno-unused-value -Wno-unused-variable -Wno-misleading-indentation
 CDBG	= 
 CREL	= -O2 -U_FORTIFY_SOURCE
 CVER	= ${CREL}

diff --git a/software/src/master/src/M_Windows/Vp.h b/software/src/master/src/M_Windows/Vp.h
@@ -123,7 +123,7 @@ typedef unsigned int		uintptr_t;
 #define stat			_stat
 #define strcasecmp		_stricmp
 #define strncasecmp		_strnicmp
-#define strtok_r(str,delim,saveptr) strtok (str,delim)
+#define strtok_r(str,delim,saveptr) strtok_s (str,delim,saveptr)
 #define umask			_umask
 #define unlink			_unlink
 #define write			_write

diff --git a/software/src/master/src/backend/IOMDriver.cpp b/software/src/master/src/backend/IOMDriver.cpp
@@ -447,9 +447,6 @@ bool IOMDriver::GetDouble (IOMHandle const* pHandle, double *value) {
  * (As used in io.cpp's IO_pfgets () method for getting input) 
  ******************************************************************************/
 void IOMDriver::Wait () {
-    if (IsNil (this))
-	return;
-
     PutBufferedData ();
 
     Vca::VCohortManager iCM; bool rHandledEvents = false;

diff --git a/software/src/master/src/backend/IOMDriver.h b/software/src/master/src/backend/IOMDriver.h
@@ -180,10 +180,10 @@ class ABSTRACT IOMDriver : public Vca::VRolePlayer {
     }
 
     IOMDriver* errorInputDriver	() const {
-	return this ? m_pErrorInputDriver.operator->() : 0;
+	return m_pErrorInputDriver;
     }
     IOMDriver* errorOutputDriver () const {
-	return this ? m_pErrorOutputDriver.operator->() : 0;
+	return m_pErrorOutputDriver;
     }
 
     bool getInputHandler (DSC_Descriptor& rInputHandler);
@@ -201,7 +201,7 @@ class ABSTRACT IOMDriver : public Vca::VRolePlayer {
     }
 
     unsigned int optionValue (IOMHandle const* pHandle) const {
-	return this ? m_iOptions.optionValue (pHandle, this) : 0;
+	return m_iOptions.optionValue (pHandle, this);
     }
 
     IOMPromptFormat promptFormat () const {

diff --git a/software/src/master/src/backend/IOMHandle.h b/software/src/master/src/backend/IOMHandle.h
@@ -35,13 +35,8 @@ class IOMHandle {
 
     IOMDriver* driver () const;
 
-    IOMDriver* errorInputDriver () const {
-	return driver ()->errorInputDriver ();
-    }
-
-    IOMDriver* errorOutputDriver () const {
-	return driver ()->errorOutputDriver ();
-    }
+    IOMDriver* errorInputDriver () const;
+    IOMDriver* errorOutputDriver () const;
 
     unsigned int index () const {
 	return m_xDriverValid ? m_xDriver + 1 : 0;
@@ -50,9 +45,7 @@ class IOMHandle {
     IOMOption optionIndex () const {
 	return (IOMOption)m_xOption;
     }
-    unsigned int optionValue () const {
-	return driver ()->optionValue (this);
-    }
+    unsigned int optionValue () const;
 
     size_t seekOffset () const {
 	return m_iSeekOffset;

diff --git a/software/src/master/src/backend/IOMService.cpp b/software/src/master/src/backend/IOMService.cpp
@@ -67,30 +67,10 @@ IOMChannelType IOMService::channelType () const {
     return IOMChannelType_Service;
 }
 
-int IOMService::getPeerNameString (char** ppString, size_t* psString) {
-#if 0
-    return GetSocketStream ()->GetSocketPeerName (&m_iStatus, ppString, psString);
-#else
-    return BaseClass::getPeerNameString (ppString, psString);
-#endif
-}
-
-int IOMService::getSocketNameString (char** ppString, size_t* psString) {
-#if 0
-    return GetSocketStream ()->GetSocketName (&m_iStatus, ppString, psString);
-#else
-    return BaseClass::getSocketNameString (ppString, psString);
-#endif
-}
-
 int IOMService::getTcpNodelay (int* fOnOff) {
-#if 0
-    return GetSocketStream ()->GetTcpNodelay (&m_iStatus, fOnOff);
-#else
     *fOnOff = false;
     m_iStatus.MakeFailureStatus ();
     return -1;
-#endif
 }
 
 
@@ -115,40 +95,18 @@ void IOMService::Close () {
 }
 
 int IOMService::EndTransmission () {
-    if (isClosing ()) {
-	m_iStatus.MakeFailureStatus ();
-	return -1;
-    }
-
-#if 0
-    return GetSocketStream ()->EndTransmission (&m_iStatus);
-#else
     m_iStatus.MakeFailureStatus ();
     return -1;
-#endif
 }
 
 int IOMService::EndReception () {
-    if (isClosing ()) {
-	m_iStatus.MakeFailureStatus ();
-	return -1;
-    }
-
-#if 0
-    return GetSocketStream ()->m_iListener.EndReception (&m_iStatus);
-#else
     m_iStatus.MakeFailureStatus ();
     return -1;
-#endif
 }
 
 int IOMService::SetTcpNodelay (int fOnOff) {
-#if 0
-    return GetSocketStream ()->SetTcpNodelay (&m_iStatus, fOnOff);
-#else
     m_iStatus.MakeFailureStatus ();
     return -1;
-#endif
 }
 
 

diff --git a/software/src/master/src/backend/IOMService.h b/software/src/master/src/backend/IOMService.h
@@ -75,10 +75,7 @@ class IOMService : public IOMDriver {
 public:
     IOMChannelType channelType () const;
 
-    int getPeerNameString	(char** ppString, size_t* psString);
-    int getSocketNameString	(char** ppString, size_t* psString);
-
-    int getTcpNodelay		(int* fOnOff);
+    int getTcpNodelay (int* fOnOff);
 
 //  Control
 public:

diff --git a/software/src/master/src/backend/IOMStream.cpp b/software/src/master/src/backend/IOMStream.cpp
@@ -909,14 +909,10 @@ IOMStream::WindowFrame::~WindowFrame () {
 }
 
 IOMStream::WindowFrame *IOMStream::WindowFrame::Pop (VReference<Producer> &rpProducer) {
-    WindowFrame *pPriorFrame = 0;
-    if (!this)
-	rpProducer.clear ();
-    else {
-	pPriorFrame = m_pPredecessor;
-	rpProducer.setTo (m_pProducer);
-	delete this;
-    }
+    WindowFrame *const pPriorFrame = m_pPredecessor;
+    rpProducer.setTo (m_pProducer);
+    delete this;
+
     return pPriorFrame;
 }
 
@@ -992,7 +988,7 @@ void IOMStream::onConnect (VBSConsumerSink *pReceiver, VBSConsumer *pBS) {
 void IOMStream::onError (
     VBSProducerSink *pReceiver, Vca::IError *pError, VString const &rMessage
 ) {
-    m_pInputStack = m_pInputStack->Pop (m_pProducer);
+    PopInput ();
 }
 
 void IOMStream::onError (
@@ -1027,30 +1023,10 @@ char const* IOMStream::consumedStartupExpression () {
     return pStartupExpression ? pStartupExpression : "";
 }
 
-int IOMStream::getPeerNameString (char** ppString, size_t* psString) {
-#if 0
-    return GetSocketStream ()->GetSocketPeerName (&m_iStatus, ppString, psString);
-#else
-    return BaseClass::getPeerNameString (ppString, psString);
-#endif
-}
-
-int IOMStream::getSocketNameString (char** ppString, size_t* psString) {
-#if 0
-    return GetSocketStream ()->GetSocketName (&m_iStatus, ppString, psString);
-#else
-    return BaseClass::getSocketNameString (ppString, psString);
-#endif
-}
-
 int IOMStream::getTcpNodelay (int* fOnOff) {
-#if 0
-    return GetSocketStream ()->GetTcpNodelay (&m_iStatus, fOnOff);
-#else
     *fOnOff = false;
     m_iStatus.MakeFailureStatus ();
     return -1;
-#endif
 }
 
 
@@ -1064,11 +1040,23 @@ int IOMStream::getTcpNodelay (int* fOnOff) {
  *****  Input Stack  *****
  *************************/
 
+void IOMStream::PushInput () {
+    m_pInputStack = new WindowFrame (m_pInputStack, m_pProducer);
+}
+
+void IOMStream::PopInput () {
+    if (m_pInputStack)
+        m_pInputStack = m_pInputStack->Pop (m_pProducer);
+    else {
+        m_pProducer.clear ();
+    }
+}
+
 void IOMStream::PopAllInput () {
     while (m_pInputStack) {
 	if (m_pProducer)
 	    m_pProducer->Close ();
-	m_pInputStack = m_pInputStack->Pop (m_pProducer);
+        PopInput ();
     }
 }
 
@@ -1157,12 +1145,8 @@ int IOMStream::EndReception () {
  *****************/
 
 int IOMStream::SetTcpNodelay (int fOnOff) {
-#if 0
-    return GetSocketStream ()->SetTcpNodelay (&m_iStatus, fOnOff);
-#else
     m_iStatus.MakeFailureStatus ();
     return -1;
-#endif
 }
 
 
@@ -1419,7 +1403,7 @@ VkStatusType IOMStream::GetLine (
 		    return VkStatusType_Failed;
 	    case VkStatusType_Closed:
 		if (m_pInputStack) {
-		    m_pInputStack = m_pInputStack->Pop (m_pProducer);
+                    PopInput ();
 		    bRescanning = true;
 		}
 		else {
@@ -1462,7 +1446,7 @@ VkStatusType IOMStream::GetLine (
 	);
 	else {
 	    m_iStatus.MakeBlockedStatus ();
-	    m_pInputStack = m_pInputStack->Push (m_pProducer);
+            PushInput ();
 	    plumb (pBS);
 	}
 

diff --git a/software/src/master/src/backend/IOMStream.h b/software/src/master/src/backend/IOMStream.h
@@ -54,12 +54,8 @@ class IOMStream : public IOMDriver {
 public:
     class WindowFrame : public VTransient {
     //  Construction
-    protected:
-	WindowFrame (WindowFrame *pPredecessor, VReference<Producer> &rpProducer);
     public:
-	WindowFrame *Push (VReference<Producer> &rpProducer) {
-	    return new WindowFrame (this, rpProducer);
-	}
+	WindowFrame (WindowFrame *pPredecessor, VReference<Producer> &rpProducer);
 
     //  Destruction
     protected:
@@ -100,13 +96,12 @@ class IOMStream : public IOMDriver {
     char const* consumedStartupExpression ();
 
 public:
-    int getPeerNameString   (char** ppString, size_t* psString);
-    int getSocketNameString (char** ppString, size_t* psString);
-
     int getTcpNodelay (int* fOnOff);
 
 //  Control
 protected:
+    void PushInput ();
+    void PopInput  ();
     void PopAllInput ();
 
     int Seek (IOMHandle const* pHandle);

diff --git a/software/src/master/src/backend/M_AND.h b/software/src/master/src/backend/M_AND.h
@@ -413,9 +413,9 @@ class M_AND : public VDatabaseActivation {
 	return AccessASD (M_POP_ObjectSpace (pPOP), aMissingSpaceIsAnError);
     }
 
-    M_ASD *AccessSpace (unsigned int xSpace);
-    M_ASD *AccessSpace (M_POP const *pPOP) {
-	return AccessSpace (M_POP_ObjectSpace (pPOP));
+    bool AccessSpace (M_ASD *&rpResult, unsigned int xSpace);
+    bool AccessSpace (M_ASD *&rpResult, M_POP const *pPOP) {
+	return AccessSpace (rpResult, M_POP_ObjectSpace (pPOP));
     }
 
     M_ASD *AccessSpace (unsigned int xSpace, bool *pfSpaceValid);

diff --git a/software/src/master/src/backend/M_ASD.cpp b/software/src/master/src/backend/M_ASD.cpp
@@ -62,7 +62,7 @@ M_ASD::M_ASD (M_AND* pAND, PS_ASD* pPASD)
  ******************************************/
 
 bool M_ASD::GetCTE (unsigned int xContainer, CTE &rResult) const {
-    if (this && xContainer < cteCount ()) {
+    if (xContainer < cteCount ()) {
 	rResult = *cte (xContainer);
 	return true;
     }

diff --git a/software/src/master/src/backend/M_ASD.h b/software/src/master/src/backend/M_ASD.h
@@ -803,7 +803,7 @@ class M_ASD : public VTransient {
 
     bool GetCTE (unsigned int xContainer, CTE &rResult) const;
     bool GetCTE (unsigned int xContainer, PS_CTE &rResult) const {
-	return IsntNil (this) && m_pPASD->GetCTE (xContainer, rResult);
+	return m_pPASD->GetCTE (xContainer, rResult);
     }
 
     bool GetCTE (int xContainer, CTE &rResult) const {

diff --git a/software/src/master/src/backend/PFprint.cpp b/software/src/master/src/backend/PFprint.cpp
@@ -2269,7 +2269,10 @@ PrivateFnDef void PrintAAsStrings (VPrimitiveTask* pTask, int size) {
 }
 
 
-    STD_sprintf (format, size == 0 ? "%%s" : "%%-%d.%ds", size, size);
+    if (0 == size)
+	STD_sprintf (format, "%%s");
+    else
+	STD_sprintf (format, "%%-%d.%ds", size, size);
     M_CPD* stringStore = pTask->ducStore ();
     rtype = ADescriptor.pointerRType ();