replace goto with loop (#1151)

2020-12-23 23:00:35 +01:00
parent 5b70871a08
commit cd33cd20ba
1 changed files with 5 additions and 6 deletions
@@ -80,8 +80,7 @@ private:

    /* Cull or trim unused Topic nodes from leaf to root */
    void trimTree(Topic *topic) {
-        repeat:
-        if (!topic->subs.size() && !topic->children.size() && !topic->terminatingWildcardChild && !topic->wildcardChild) {
+        while (!topic->subs.size() && !topic->children.size() && !topic->terminatingWildcardChild && !topic->wildcardChild) {
            Topic *parent = topic->parent;

            if (topic->length == 1) {
@@ -114,11 +113,11 @@ private:
            delete [] topic->name;
            delete topic;

-            if (parent != root) {
-                topic = parent;
-                goto repeat;
-                //trimTree(parent);
+            if (parent == root) {
+              break;
            }
+
+            topic = parent;
        }
    }