static int neatoModel(graph_t * g)
{
char *p = agget(g, "model");
- char c;
- if (!p || (!(c = *p))) /* if p is NULL or "" */
+ if (!p || streq(p, "")) /* if p is NULL or "" */
return MODEL_SHORTPATH;
- if ((c == 'c') && streq(p, "circuit"))
+ if (streq(p, "circuit"))
return MODEL_CIRCUIT;
- if (c == 's') {
- if (streq(p, "subset"))
- return MODEL_SUBSET;
- else if (streq(p, "shortpath"))
- return MODEL_SHORTPATH;
- }
- if ((c == 'm') && streq(p, "mds")) {
+ if (streq(p, "subset"))
+ return MODEL_SUBSET;
+ if (streq(p, "shortpath"))
+ return MODEL_SHORTPATH;
+ if (streq(p, "mds")) {
if (agattr(g, AGEDGE, "len", 0))
return MODEL_MDS;
else {
int mode = MODE_MAJOR; /* default mode */
str = agget(g, "mode");
- if (str && *str) {
+ if (str && !streq(str, "")) {
if (streq(str, "KK"))
mode = MODE_KK;
else if (streq(str, "major"))