core plugin: replace 'assert(0)' with 'UNREACHABLE()'

The latter is more robust and clearer in intent.

diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c
index 661f91b4586defc387668ff77155d22e4407b740..58454f355bf1592e538984d37f3ee6bc0c7b039f 100644 (file)
--- a/plugin/core/gvrender_core_fig.c
+++ b/plugin/core/gvrender_core_fig.c
@@ -26,6 +26,7 @@
 #include <gvc/gvplugin_device.h>
 #include <gvc/gvio.h>
 #include <cgraph/agxbuf.h>
+#include <cgraph/unreachable.h>
 #include <common/utils.h>
 #include <common/color.h>
 
@@ -119,7 +120,7 @@ static void fig_resolve_color(GVJ_t *job, gvcolor_t * color)
            color->u.index = i;
            break;
        default:
-           assert(0);  /* internal error */
+           UNREACHABLE(); // internal error
     }
 
     color->type = COLOR_INDEX;

diff --git a/plugin/core/gvrender_core_map.c b/plugin/core/gvrender_core_map.c
index 11e7b486fef25cef7f678648503045bee56977d7..3f62d4a37b444d0c22ac62500af3253161a4eaf8 100644 (file)
--- a/plugin/core/gvrender_core_map.c
+++ b/plugin/core/gvrender_core_map.c
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 
+#include <cgraph/unreachable.h>
 #include <common/types.h>
 #include <common/utils.h>
 #include <gvc/gvplugin_render.h>
@@ -61,8 +62,7 @@ static void map_output_shape (GVJ_t *job, map_shape_t map_shape, pointf * AF, in
             gvputs(job, "\n");
             break;
         default:
-            assert(0);
-            break;
+            UNREACHABLE();
         }
 
     } else if (job->render.id == FORMAT_ISMAP && url && url[0]) {
@@ -77,8 +77,7 @@ static void map_output_shape (GVJ_t *job, map_shape_t map_shape, pointf * AF, in
            break;
         }
         default:
-            assert(0);
-            break;
+            UNREACHABLE();
         }
 
     } else if (job->render.id == FORMAT_CMAP || job->render.id == FORMAT_CMAPX) {
@@ -93,8 +92,7 @@ static void map_output_shape (GVJ_t *job, map_shape_t map_shape, pointf * AF, in
             gvputs(job, "<area shape=\"poly\"");
             break;
         default:
-            assert(0);
-            break;
+            UNREACHABLE();
         }
         if (id && id[0]) {
             gvputs(job, " id=\"");

diff --git a/plugin/core/gvrender_core_mp.c b/plugin/core/gvrender_core_mp.c
index 1a69ff69f6b1582296690589965c71c092199219..0c71963539fdb413f87b31a3cc9bf3e320b86297 100644 (file)
--- a/plugin/core/gvrender_core_mp.c
+++ b/plugin/core/gvrender_core_mp.c
@@ -21,6 +21,7 @@
 #include <io.h>
 #endif
 
+#include <cgraph/unreachable.h>
 #include <common/macros.h>
 #include <common/const.h>
 
@@ -123,7 +124,7 @@ static void mp_resolve_color(GVJ_t *job, gvcolor_t * color)
            color->u.index = 0;
             break;
        default:
-           assert(0);  /* internal error */
+           UNREACHABLE(); // internal error
     }
 
     color->type = COLOR_INDEX;

diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c
index f86da09eb11998c7006658a1e7f555377e0220d2..d77532c80100df94cd0dc24cddeba66f2f734e66 100644 (file)
--- a/plugin/core/gvrender_core_svg.c
+++ b/plugin/core/gvrender_core_svg.c
@@ -31,6 +31,7 @@
 
 #include <gvc/gvplugin_render.h>
 #include <cgraph/agxbuf.h>
+#include <cgraph/unreachable.h>
 #include <common/utils.h>
 #include <gvc/gvplugin_device.h>
 #include <gvc/gvio.h>
@@ -127,7 +128,7 @@ static void svg_print_paint(GVJ_t * job, gvcolor_t color)
                     color.u.rgba[0], color.u.rgba[1], color.u.rgba[2]);
        break;
     default:
-       assert(0);              /* internal error */
+       UNREACHABLE(); // internal error
     }
 }
 
@@ -152,7 +153,7 @@ static void svg_print_gradient_color(GVJ_t * job, gvcolor_t color)
                 color.u.rgba[0], color.u.rgba[1], color.u.rgba[2]);
        break;
     default:
-       assert(0);              /* internal error */
+       UNREACHABLE(); // internal error
     }
 }
 
@@ -502,7 +503,7 @@ static void svg_textspan(GVJ_t * job, pointf p, textspan_t * span)
            gvprintf(job, " fill-opacity=\"%f\"", ((float) obj->pencolor.u.rgba[3] / 255.0));
        break;
     default:
-       assert(0);              /* internal error */
+       UNREACHABLE(); // internal error
     }
     gvputc(job, '>');
     if (obj->labeledgealigned) {

diff --git a/plugin/core/gvrender_core_tk.c b/plugin/core/gvrender_core_tk.c
index f197b2f63108b0c66612d85fb38902b26ffeff1e..17bba9a6fc280af3b87813aa80211761b6fce778 100644 (file)
--- a/plugin/core/gvrender_core_tk.c
+++ b/plugin/core/gvrender_core_tk.c
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <cgraph/unreachable.h>
 #include <common/macros.h>
 #include <common/const.h>
 
@@ -45,7 +46,7 @@ static void tkgen_print_color(GVJ_t * job, gvcolor_t color)
                color.u.rgba[0], color.u.rgba[1], color.u.rgba[2]);
        break;
     default:
-       assert(0);              /* internal error */
+       UNREACHABLE(); // internal error
     }
 }
 
@@ -102,8 +103,7 @@ static void tkgen_print_tags(GVJ_t *job)
        ObjId = AGID(obj->u.sg);
        break;
     default:
-       assert (0);
-       break;
+       UNREACHABLE();
     }
     gvprintf(job, " -tags {%d%s0x%" PRIx64 "}", ObjFlag, ObjType, ObjId);
 }

diff --git a/plugin/core/gvrender_core_vml.c b/plugin/core/gvrender_core_vml.c
index e6314a529ac64a24a1254e04a4d3b5de02efbceb..81e2cde4404d3e365093f6aa90d97020b500740a 100644 (file)
--- a/plugin/core/gvrender_core_vml.c
+++ b/plugin/core/gvrender_core_vml.c
@@ -25,6 +25,7 @@
 #include <gvc/gvio.h>
 #include <common/memory.h>
 #include <cgraph/strcasecmp.h>
+#include <cgraph/unreachable.h>
 
 typedef enum { FORMAT_VML, FORMAT_VMLZ, } format_type;
 
@@ -61,7 +62,7 @@ static void vml_print_color(GVJ_t * job, gvcolor_t color)
                color.u.rgba[0], color.u.rgba[1], color.u.rgba[2]);
        break;
     default:
-       assert(0);              /* internal error */
+       UNREACHABLE(); // internal error
     }
 }
 
@@ -316,7 +317,7 @@ static void vml_textspan(GVJ_t * job, pointf p, textspan_t * span)
                obj->pencolor.u.rgba[0], obj->pencolor.u.rgba[1], obj->pencolor.u.rgba[2]);
        break;
     default:
-       assert(0);              /* internal error */
+       UNREACHABLE(); // internal error
     }
     gvputs(job, "\"><center>");
     html_puts(job, span->str);