Skip to content

Fix spurious warning with subplot -B+a modifiers #9085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Esteban82 merged 1 commit into from
Jul 3, 2026
+19 −5
Merged

Fix spurious warning with subplot -B+a modifiers #9085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/subplot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ static int parse (struct GMT_CTRL *GMT, struct SUBPLOT_CTRL *Ctrl, struct GMT_OP

unsigned int n_errors = 0, error, k, j, n = 0, pos, side;
bool B_args = false, noB = false;
char *c = NULL, add[2] = {0, 0}, string[GMT_LEN128] = {""}, p[GMT_LEN128] = {""};
char *c = NULL, *s = NULL, add[2] = {0, 0}, string[GMT_LEN128] = {""}, p[GMT_LEN128] = {""};
struct GMT_OPTION *opt = NULL, *Bframe = NULL, *Bx = NULL, *By = NULL, *Bxy = NULL;
struct GMT_PEN pen; /* Only used to make sure any pen is given with correct syntax */
struct GMT_FILL fill; /* Only used to make sure any fill is given with correct syntax */
Expand Down Expand Up @@ -703,9 +703,16 @@ static int parse (struct GMT_CTRL *GMT, struct SUBPLOT_CTRL *Ctrl, struct GMT_OP
}
}
if (Bx) { /* Did get separate x-axis annotation settings */
if ((c = gmt_first_modifier (GMT, Bx->arg, "lpsu"))) { /* Gave valid axes modifiers for custom labels */
s = Bx->arg;
/* +a (annotation angle/parallel/normal) is a valid modifier but must not be treated as the
* cut point below since it has to survive verbatim in Ctrl->S[GMT_X].b; skip past any +a
* we encounter and keep looking for a genuine label/prefix/unit modifier to truncate at.
* Note: if +a appears *after* a genuine l/p/s/u modifier it will still be chopped off below;
* that combination is not currently supported. */
while ((c = gmt_first_modifier (GMT, s, "alpsu")) && c[1] == 'a') s = c + 2;
if (c) { /* Gave valid axes modifiers for custom labels */
pos = error = 0;
while (gmt_getmodopt (GMT, 'B', c, "lpsu", &pos, p, &error) && error == 0) {
while (gmt_getmodopt (GMT, 'B', c, "alpsu", &pos, p, &error) && error == 0) {
switch (p[0]) {
case 'l': /* Regular x-axis label */
Ctrl->S[GMT_X].label[GMT_PRIMARY] = strdup (&p[1]); break;
Expand All @@ -715,6 +722,8 @@ static int parse (struct GMT_CTRL *GMT, struct SUBPLOT_CTRL *Ctrl, struct GMT_OP
Ctrl->S[GMT_X].label[GMT_SECONDARY] = strdup (&p[1]); break;
case 'u': /* Annotation units */
Ctrl->S[GMT_X].unit[GMT_PRIMARY] = strdup (&p[1]); break;
case 'a': /* Annotation angle/parallel/normal - passed through verbatim via subplot_prep_annot_args */
break;
default: /* These are caught in gmt_getmodopt so break is just for Coverity */
break;
}
Expand All @@ -728,9 +737,12 @@ static int parse (struct GMT_CTRL *GMT, struct SUBPLOT_CTRL *Ctrl, struct GMT_OP
else if (Bxy) /* Did common x and y-axes annotation settings */
Ctrl->S[GMT_X].b = strdup (Bxy->arg);
if (By) { /* Did get y-axis annotation settings */
if ((c = gmt_first_modifier (GMT, By->arg, "lpsu"))) { /* Gave valid axes modifiers for custom labels */
s = By->arg;
/* See comment in the Bx block above: skip past +a so it is preserved verbatim. */
while ((c = gmt_first_modifier (GMT, s, "alpsu")) && c[1] == 'a') s = c + 2;
if (c) { /* Gave valid axes modifiers for custom labels */
pos = 0;
while (gmt_getmodopt (GMT, 'B', c, "lpsu", &pos, p, &error) && error == 0) {
while (gmt_getmodopt (GMT, 'B', c, "alpsu", &pos, p, &error) && error == 0) {
switch (p[0]) {
case 'l': /* Regular y-axis label */
Ctrl->S[GMT_Y].label[GMT_PRIMARY] = strdup (&p[1]); break;
Expand All @@ -740,6 +752,8 @@ static int parse (struct GMT_CTRL *GMT, struct SUBPLOT_CTRL *Ctrl, struct GMT_OP
Ctrl->S[GMT_Y].label[GMT_SECONDARY] = strdup (&p[1]); break;
case 'u': /* Annotation units */
Ctrl->S[GMT_Y].unit[GMT_PRIMARY] = strdup (&p[1]); break;
case 'a': /* Annotation angle/parallel/normal - passed through verbatim via subplot_prep_annot_args */
break;
default: /* These are caught in gmt_getmodopt so break is just for Coverity */
break;
}
Expand Down
Loading