replace goto end with ClearUnitIfMemFailed

also set default calc function

Author: capital-G

source/DEINDUGens/JPverbRaw.cpp

@@ -1526,16 +1526,18 @@ void Faust_next_clear(Faust* unit, int inNumSamples)
 
 void Faust_Ctor(Faust* unit)  // module constructor
 {
-    // init such that we can use generic end goto
+    // init such that we can still free them in the destructor if
+    // allocation fails.
     unit->mDSP = nullptr;
     unit->mInBufCopy = nullptr;
     unit->mInBufValue = nullptr;
 
+    // set a default calc function
+    SETCALC(Faust_next_clear);
+
     // allocate dsp
     void* mem = RTAlloc(unit->mWorld, sizeof(FAUSTCLASS));
-    if (mem == nullptr) {
-        goto end;
-    }
+    ClearUnitIfMemFailed(mem);
     unit->mDSP = new (mem) FAUSTCLASS();
     {
         // init dsp
@@ -1566,21 +1568,15 @@ void Faust_Ctor(Faust* unit)  // module constructor
                 SETCALC(Faust_next);
             } else {
                 unit->mInBufCopy = (float**)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*sizeof(float*));
-                if (!unit->mInBufCopy) {
-                    goto end;
-                }
+                ClearUnitIfMemFailed(unit->mInBufCopy);
                 // Allocate memory for input buffer copies (numInputs * bufLength)
                 // and linear interpolation state (numInputs)
                 // = numInputs * (bufLength + 1)
                 unit->mInBufValue = (float*)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*sizeof(float));
-                if (!unit->mInBufValue) {
-                    goto end;
-                }
+                ClearUnitIfMemFailed(unit->mInBufValue);
                 // Aquire memory for interpolator state.
-                float* mem = (float*)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*BUFLENGTH*sizeof(float));
-                if (mem) {
-                    goto end;
-                }
+                auto* mem = (float*)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*BUFLENGTH*sizeof(float));
+                ClearUnitIfMemFailed(mem);
                 for (int i = 0; i < unit->getNumAudioInputs(); ++i) {
                     // Initialize interpolator.
                     unit->mInBufValue[i] = IN0(i);
@@ -1610,11 +1606,6 @@ void Faust_Ctor(Faust* unit)  // module constructor
         }
     }
 
-end:
-    Print("Faust[%s]: RT memory allocation failed, try increasing the real-time memory size in the server options\n", g_unitName);
-    RTFree(unit->mWorld, unit->mDSP);
-    RTFree(unit->mWorld, unit->mInBufCopy);
-    RTFree(unit->mWorld, unit->mInBufValue);
     // Fix for https://github.com/grame-cncm/faust/issues/13
     ClearUnitOutputs(unit, 1);
 }