Skip to content

Commit

Permalink
lstopo/ascii: don't warn when forcing gridsize/fontsize/linespacing t…
Browse files Browse the repository at this point in the history
…o 10

It's documented, and it doesn't matter much anyway.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed May 3, 2018
1 parent 7876928 commit 3aa0ce8
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions utils/lstopo/lstopo-ascii.c
Expand Up @@ -292,7 +292,7 @@ merge(struct lstopo_ascii_output *disp, int x, int y, int or, int andnot, const
put(disp, x, y, from_directions(disp, directions), NULL, color);
}

/* 10 is the only allowed gridsize/fontsize/linespacing.
/* 10 is the only allowed gridsize/fontsize/linespacing (enforced in output_ascii()).
* vertically, it's a line of text.
* horizontally, it's 2 chars (so that we get a space between text and boxes
*/
Expand Down Expand Up @@ -451,18 +451,9 @@ output_ascii(struct lstopo_output *loutput, const char *filename)
return -1;
}

if (loutput->gridsize != 10) {
fprintf(stderr, "--gridsize ignored in the ASCII backend.\n");
loutput->gridsize = 10;
}
if (loutput->fontsize && loutput->fontsize != 10) {
fprintf(stderr, "--fontsize ignored in the ASCII backend.\n");
loutput->fontsize = 10;
}
if (loutput->linespacing != 10) {
fprintf(stderr, "--linespacing ignored in the ASCII backend.\n");
loutput->linespacing = 10;
}
loutput->gridsize = 10;
loutput->fontsize = 10;
loutput->linespacing = 10;

/* cannot write between lines of the terminal */
loutput->no_half_lines = 1;
Expand Down

0 comments on commit 3aa0ce8

Please sign in to comment.