Add configuration for building on Ubuntu 22.04

deploy/os/ubuntu22.opts

@@ -0,0 +1 @@
+--platform=debian --valgrind=memcheck,helgrind --dockerimage=mdsplus/builder:ubuntu22-64 --distname=Ubuntu22 --arch=amd64

deploy/packaging/linux.xml

@@ -822,6 +822,13 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2>/dev/null
  </packages>
 
  <!-- dist first -->
+ <external_packages dist="Ubuntu22">
+   <numpy package="python3-numpy"/>
+   <java package="java-runtime"/>
+   <xinetd package="busybox"/>
+   <readline package="libreadline8"/>
+ </external_packages>
+
  <external_packages dist="Ubuntu20">
    <numpy package="python3-numpy"/>
    <java package="java-runtime"/>

mdsobjects/cpp/mdsipobjects.cpp

@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace MDSplus;
 using namespace std;
 
-extern "C" void *getManyObj(char *serializedIn) throw(MdsException);
-extern "C" void *putManyObj(char *serializedIn) throw(MdsException);
+extern "C" void *getManyObj(char *serializedIn);
+extern "C" void *putManyObj(char *serializedIn);
 extern "C" void *compileFromExprWithArgs(char *expr, int nArgs, void *args,
                                          void *tree);
 extern "C" int SendArg(int sock, unsigned char idx, char dtype,
@@ -108,7 +108,7 @@ static int convertType(int mdsType)
   }
 }
 
-void *getManyObj(char *serializedIn) throw(MdsException)
+void *getManyObj(char *serializedIn)
 {
   AutoData<List> inArgs((List *)deserialize((const char *)serializedIn));
   if (inArgs->clazz != CLASS_APD) // || inArgs->dtype != DTYPE_LIST)
@@ -241,7 +241,7 @@ void *getManyObj(char *serializedIn) throw(MdsException)
   return result->convertToDsc();
 }
 
-void *putManyObj(char *serializedIn) throw(MdsException)
+void *putManyObj(char *serializedIn)
 {
   AutoData<List> inArgs((List *)deserialize((const char *)serializedIn));
   if (inArgs->clazz != CLASS_APD) // || inArgs->dtype != DTYPE_LIST)

mdstcpip/udt4/src/core.cpp

@@ -688,7 +688,7 @@ void CUDT::connect(const sockaddr *serv_addr) {
 }
 #pragma GCC diagnostic pop
 
-int CUDT::connect(const CPacket &response) throw() {
+int CUDT::connect(const CPacket &response) {
   // this is the 2nd half of a connection request. If the connection is setup
   // successfully this returns 0. returning -1 means there is an error.
   // returning 1 or 2 means the connection is in process and needs more

mdstcpip/udt4/src/core.h

@@ -159,7 +159,7 @@ class CUDT {
   //    Return 0 if connected, positive value if connection is in progress,
   //    otherwise error code.
 
-  int connect(const CPacket &pkt) throw();
+  int connect(const CPacket &pkt);
 
   // Functionality:
   //    Connect to a UDT entity listening at address "peer", which has sent "hs"

xtreeshr/XTreeDefaultSquish.c

@@ -254,8 +254,10 @@ static inline int mergeArrays(struct descriptor_a *signalsApd,
       (struct descriptor_xd *)malloc(numSignals * sizeof(struct descriptor_xd));
   for (i = 0; i < numSignals; i++)
     (*dimensionsXd)[i] = emptyXd;
-  arraysD = (struct descriptor_a **)(*arraysBuf =
-                                         malloc(numSignals * sizeof(char *)));
+  size_t arraysDsize = numSignals * sizeof(char *);
+  *arraysBuf = malloc(arraysDsize);
+  arraysD = (struct descriptor_a **)(*arraysBuf);
+  memset(arraysD, 0, arraysDsize);
   // Evaluate first dimension for all segments
   int totSize = 0;
   for (i = 0; i < numSignals; i++)