From 7b4edf14bb16fbe786e55b829a208960396ce8df Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 12 Apr 2017 14:47:30 +0900 Subject: common: Simplify format_text. * common/stringhelp.c (format_text): Don't allow IN_PLACE formatting. * common/stringhelp.h: Change the API with no IN_PLACE. * common/t-stringhelp.c (test_format_text): Follow the change. * g10/gpgcompose.c (show_help): Likewise. * g10/tofu.c (format_conflict_msg_part1, ask_about_binding) (show_statistics, show_warning): Likewise. Signed-off-by: NIIBE Yutaka --- common/stringhelp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'common/stringhelp.c') diff --git a/common/stringhelp.c b/common/stringhelp.c index bea146647..509d327b0 100644 --- a/common/stringhelp.c +++ b/common/stringhelp.c @@ -1443,11 +1443,10 @@ compare_version_strings (const char *my_version, const char *req_version) /* Format a string so that it fits within about TARGET_COLS columns. - If IN_PLACE is 0, then TEXT is copied to a new buffer, which is - returned. Otherwise, TEXT is modified in place and returned. + TEXT_IN is copied to a new buffer, which is returned. Normally, target_cols will be 72 and max_cols is 80. */ char * -format_text (char *text, int in_place, int target_cols, int max_cols) +format_text (const char *text_in, int target_cols, int max_cols) { const int do_debug = 0; @@ -1459,9 +1458,9 @@ format_text (char *text, int in_place, int target_cols, int max_cols) char *last_space = NULL; int last_space_cols = 0; int copied_last_space = 0; + char *text; - if (! in_place) - text = xstrdup (text); + text = xstrdup (text_in); p = line = text; while (1) -- cgit v1.2.3