while (*s) s++;
s--;
/* skip over trailing slashes, nulling out as we go */
- while ((s > path) && ((*s == '/') || (*s == '\\')))
+ while (s > path && (*s == '/' || *s == '\\'))
*s-- = '\0';
if (s == path) ret = path;
else {
- while ((s > path) && ((*s != '/') && (*s != '\\'))) s--;
- if ((*s == '/') || (*s == '\\')) ret = s+1;
+ while (s > path && (*s != '/' && *s != '\\')) s--;
+ if (*s == '/' || *s == '\\') ret = s+1;
else ret = path;
}
#ifdef _WIN32
agxbinit(&xb, SMALLBUF, buf);
for (i = 1; i < argc; i++) {
if (argv[i] && argv[i][0] == '-') {
- rest = &(argv[i][2]);
+ rest = &argv[i][2];
switch (c = argv[i][1]) {
case 'G':
if (*rest)
if ((p = agget(g, name))) {
i = sscanf(p, "%lf,%lf%c", &xf, &yf, &c);
- if ((i > 1) && (xf > 0) && (yf > 0)) {
+ if (i > 1 && xf > 0 && yf > 0) {
result->x = POINTS(xf);
result->y = POINTS(yf);
if (c == '!')
else {
c = '\0';
i = sscanf(p, "%lf%c", &xf, &c);
- if ((i > 0) && (xf > 0)) {
+ if (i > 0 && xf > 0) {
result->y = result->x = POINTS(xf);
if (c == '!') rv = TRUE;
}
char *p, c;
double ratio;
- if ((p = agget(g, "ratio")) && ((c = p[0]))) {
+ if ((p = agget(g, "ratio")) && (c = p[0])) {
switch (c) {
case 'a':
if (streq(p, "auto"))
GD_drawing(g)->centered = mapbool(agget(g, "center"));
if ((p = agget(g, "rotate")))
- GD_drawing(g)->landscape = (atoi(p) == 90);
+ GD_drawing(g)->landscape = atoi(p) == 90;
else if ((p = agget(g, "orientation")))
- GD_drawing(g)->landscape = ((p[0] == 'l') || (p[0] == 'L'));
+ GD_drawing(g)->landscape = p[0] == 'l' || p[0] == 'L';
else if ((p = agget(g, "landscape")))
GD_drawing(g)->landscape = mapbool(p);
int pos_ix;
/* it would be nice to allow multiple graph labels in the future */
- if ((str = agget(sg, "label")) && (*str != '\0')) {
+ if ((str = agget(sg, "label")) && *str != '\0') {
char pos_flag;
pointf dimen;
GD_has_labels(sg->root) |= GRAPH_LABEL;
- GD_label(sg) = make_label(sg, str, (aghtmlstr(str) ? LT_HTML : LT_NONE),
+ GD_label(sg) = make_label(sg, str, aghtmlstr(str) ? LT_HTML : LT_NONE,
late_double(sg, agfindgraphattr(sg, "fontsize"),
DEFAULT_FONTSIZE, MIN_FONTSIZE),
late_nnstring(sg, agfindgraphattr(sg, "fontname"),
/* set label position */
pos = agget(sg, "labelloc");
if (sg != agroot(sg)) {
- if (pos && (pos[0] == 'b'))
+ if (pos && pos[0] == 'b')
pos_flag = LABEL_AT_BOTTOM;
else
pos_flag = LABEL_AT_TOP;
} else {
- if (pos && (pos[0] == 't'))
+ if (pos && pos[0] == 't')
pos_flag = LABEL_AT_TOP;
else
pos_flag = LABEL_AT_BOTTOM;