Remove some uses of abort().

diff --git a/lib/cgraph/apply.c b/lib/cgraph/apply.c
index 7eff8a17fe84f028f59496bdf02c328cc8f5a197..467c57b0a71d5bc7397e59dc17fd44b21a099593 100644 (file)
--- a/lib/cgraph/apply.c
+++ b/lib/cgraph/apply.c
@@ -76,7 +76,9 @@ int agapply(Agraph_t * g, Agobj_t * obj, agobjfn_t fn, void *arg,
        objsearch = subedge_search;
        break;
     default:
-       abort();
+       agerr(AGERR, "agapply: unknown object type %d\n", AGTYPE(obj));
+       return FAILURE;
+       break;
     }
     if ((subobj = objsearch(g, obj))) {
        rec_apply(g, subobj, fn, arg, objsearch, preorder);

diff --git a/lib/cgraph/attr.c b/lib/cgraph/attr.c
index 67a41c87239a8e01a8105d2ec9e4b9ca16f23eb7..c33fa54bea4aff83b6cd44200f407661ebebc03d 100644 (file)
--- a/lib/cgraph/attr.c
+++ b/lib/cgraph/attr.c
@@ -68,7 +68,9 @@ Dict_t *agdictof(Agraph_t * g, int kind)
            dict = dd->dict.e;
            break;
        default:
-           abort();
+           agerr(AGERR,"agdictof: unknown kind %d\n", kind);
+           dict = NIL(Dict_t *);
+           break;
     } else
        dict = NIL(Dict_t *);
     return dict;

diff --git a/lib/cgraph/grammar.y b/lib/cgraph/grammar.y
index 9ce10067598a64c4dee27b4df51f54b2905a7a14..5dfcc17d8e702e6a5faeb5557e3b65d7450145b2 100644 (file)
--- a/lib/cgraph/grammar.y
+++ b/lib/cgraph/grammar.y
@@ -299,6 +299,9 @@ static void nomacros(void)
        agerr(AGWARN,"attribute macros not implemented");
 }
 
+/* attrstmt:
+ * First argument is always attrtype, so switch covers all cases.
+ */
 static void attrstmt(int tkind, char *macroname)
 {
        item                    *aptr;
@@ -315,7 +318,6 @@ static void attrstmt(int tkind, char *macroname)
                case T_graph: kind = AGRAPH; break;
                case T_node: kind = AGNODE; break;
                case T_edge: kind = AGEDGE; break;
-               default : abort();
        }
        bindattrs(kind);        /* set up defaults for new attributes */
        for (aptr = Attrlist.first; aptr; aptr = aptr->next) {