From 9a66e1e76fbde53ecf0e7684e5a942d96f4c9780 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 4 Feb 2014 23:34:54 +0100 Subject: [PATCH] lib/tt: add tt_line_get_userdata() Signed-off-by: Karel Zak --- include/tt.h | 1 + lib/tt.c | 5 +++++ misc-utils/findmnt.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/tt.h b/include/tt.h index 198ccdcb7d..ae81d4f3be 100644 --- a/include/tt.h +++ b/include/tt.h @@ -97,6 +97,7 @@ extern struct tt_line *tt_add_line(struct tt *tb, struct tt_line *parent); extern int tt_line_set_data(struct tt_line *ln, int colnum, char *data); extern int tt_line_set_userdata(struct tt_line *ln, void *data); +extern void *tt_line_get_userdata(struct tt_line *ln); extern void tt_fputs_quoted(const char *data, FILE *out); extern void tt_fputs_nonblank(const char *data, FILE *out); diff --git a/lib/tt.c b/lib/tt.c index 47555024ef..6b630f8e7f 100644 --- a/lib/tt.c +++ b/lib/tt.c @@ -310,6 +310,11 @@ int tt_line_set_userdata(struct tt_line *ln, void *data) return 0; } +void *tt_line_get_userdata(struct tt_line *ln) +{ + return ln ? ln->userdata : NULL; +} + static char *line_get_ascii_art(struct tt_line *ln, char *buf, size_t *bufsz) { const char *art; diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index dc1cbb745b..874bd01c6c 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -702,7 +702,7 @@ static int has_line(struct tt *tt, struct libmnt_fs *fs) list_for_each(p, &tt->tb_lines) { struct tt_line *ln = list_entry(p, struct tt_line, ln_lines); - if ((struct libmnt_fs *) ln->userdata == fs) + if ((struct libmnt_fs *) tt_line_get_userdata(ln) == fs) return 1; } return 0; -- 2.47.2