From 63c9c05d358c339b473b6f18d9a6f3fe0e6bce42 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 1 Feb 2018 13:18:57 +0100 Subject: misc: remove %p from debug messages From libs where suid program may be executed by non-root user. Signed-off-by: Karel Zak --- libsmartcols/src/cell.c | 2 +- libsmartcols/src/column.c | 2 +- libsmartcols/src/line.c | 6 +++--- libsmartcols/src/table.c | 14 +++++++------- libsmartcols/src/table_print.c | 6 +----- 5 files changed, 13 insertions(+), 17 deletions(-) (limited to 'libsmartcols') diff --git a/libsmartcols/src/cell.c b/libsmartcols/src/cell.c index 783bac2eb..0717a2d09 100644 --- a/libsmartcols/src/cell.c +++ b/libsmartcols/src/cell.c @@ -252,6 +252,6 @@ int scols_cell_copy_content(struct libscols_cell *dest, if (!rc) dest->userdata = src->userdata; - DBG(CELL, ul_debugobj(src, "copy into %p", dest)); + DBG(CELL, ul_debugobj(src, "copy")); return rc; } diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c index ba6c31920..b09015afc 100644 --- a/libsmartcols/src/column.c +++ b/libsmartcols/src/column.c @@ -96,7 +96,7 @@ struct libscols_column *scols_copy_column(const struct libscols_column *cl) if (!ret) return NULL; - DBG(COL, ul_debugobj(cl, "copy to %p", ret)); + DBG(COL, ul_debugobj(cl, "copy")); if (scols_column_set_color(ret, cl->color)) goto err; diff --git a/libsmartcols/src/line.c b/libsmartcols/src/line.c index ace6239ae..60be2c135 100644 --- a/libsmartcols/src/line.c +++ b/libsmartcols/src/line.c @@ -217,7 +217,7 @@ int scols_line_remove_child(struct libscols_line *ln, struct libscols_line *chil if (!ln || !child) return -EINVAL; - DBG(LINE, ul_debugobj(ln, "remove child %p", child)); + DBG(LINE, ul_debugobj(ln, "remove child")); list_del_init(&child->ln_children); child->parent = NULL; @@ -241,7 +241,7 @@ int scols_line_add_child(struct libscols_line *ln, struct libscols_line *child) if (!ln || !child) return -EINVAL; - DBG(LINE, ul_debugobj(ln, "add child %p", child)); + DBG(LINE, ul_debugobj(ln, "add child")); scols_ref_line(child); scols_ref_line(ln); @@ -503,7 +503,7 @@ struct libscols_line *scols_copy_line(const struct libscols_line *ln) ret->ncells = ln->ncells; ret->seqnum = ln->seqnum; - DBG(LINE, ul_debugobj(ln, "copy to %p", ret)); + DBG(LINE, ul_debugobj(ln, "copy")); for (i = 0; i < ret->ncells; ++i) { if (scols_cell_copy_content(&ret->cells[i], &ln->cells[i])) diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c index c1ed9e5e9..408a95cc4 100644 --- a/libsmartcols/src/table.c +++ b/libsmartcols/src/table.c @@ -185,7 +185,7 @@ int scols_table_add_column(struct libscols_table *tb, struct libscols_column *cl if (cl->flags & SCOLS_FL_TREE) tb->ntreecols++; - DBG(TAB, ul_debugobj(tb, "add column %p", cl)); + DBG(TAB, ul_debugobj(tb, "add column")); list_add_tail(&cl->cl_columns, &tb->tb_columns); cl->seqnum = tb->ncols++; cl->table = tb; @@ -225,7 +225,7 @@ int scols_table_remove_column(struct libscols_table *tb, if (cl->flags & SCOLS_FL_TREE) tb->ntreecols--; - DBG(TAB, ul_debugobj(tb, "remove column %p", cl)); + DBG(TAB, ul_debugobj(tb, "remove column")); list_del_init(&cl->cl_columns); tb->ncols--; cl->table = NULL; @@ -557,7 +557,7 @@ int scols_table_add_line(struct libscols_table *tb, struct libscols_line *ln) return rc; } - DBG(TAB, ul_debugobj(tb, "add line %p", ln)); + DBG(TAB, ul_debugobj(tb, "add line")); list_add_tail(&ln->ln_lines, &tb->tb_lines); ln->seqnum = tb->nlines++; scols_ref_line(ln); @@ -580,7 +580,7 @@ int scols_table_remove_line(struct libscols_table *tb, if (!tb || !ln) return -EINVAL; - DBG(TAB, ul_debugobj(tb, "remove line %p", ln)); + DBG(TAB, ul_debugobj(tb, "remove line")); list_del_init(&ln->ln_lines); tb->nlines--; scols_unref_line(ln); @@ -724,7 +724,7 @@ struct libscols_table *scols_copy_table(struct libscols_table *tb) if (!ret) return NULL; - DBG(TAB, ul_debugobj(tb, "copy into %p", ret)); + DBG(TAB, ul_debugobj(tb, "copy")); if (tb->symbols) scols_table_set_symbols(ret, tb->symbols); @@ -838,14 +838,14 @@ int scols_table_set_symbols(struct libscols_table *tb, /* remove old */ if (tb->symbols) { - DBG(TAB, ul_debugobj(tb, "remove symbols %p reference", tb->symbols)); + DBG(TAB, ul_debugobj(tb, "remove symbols reference")); scols_unref_symbols(tb->symbols); tb->symbols = NULL; } /* set new */ if (sy) { /* ref user defined */ - DBG(TAB, ul_debugobj(tb, "set symbols so %p", sy)); + DBG(TAB, ul_debugobj(tb, "set symbols")); tb->symbols = sy; scols_ref_symbols(sy); } diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 2e1c55ee1..5606d23de 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -441,10 +441,6 @@ static int print_data(struct libscols_table *tb, assert(tb); assert(cl); - DBG(TAB, ul_debugobj(tb, - " -> data, column=%p, line=%p, cell=%p, buff=%p", - cl, ln, ce, buf)); - data = buffer_get_data(buf); if (!data) data = ""; @@ -720,7 +716,7 @@ static int print_line(struct libscols_table *tb, assert(ln); - DBG(TAB, ul_debugobj(tb, "printing line, line=%p, buff=%p", ln, buf)); + DBG(TAB, ul_debugobj(tb, "printing line")); /* regular line */ scols_reset_iter(&itr, SCOLS_ITER_FORWARD); -- cgit v1.2.3-55-g7522