security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

common: Simplify format_text.

Browse source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-04-12 14:47:30 +09:00
parent 7f9032d4a8
commit 7b4edf14bb
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/stringhelp.c
View file

@ -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)

2
common/stringhelp.h
View file

@ -155,7 +155,7 @@ int split_fields (char *string, char **array, int arraysize);
int compare_version_strings (const char *my_version, const char *req_version);
/* Format a string so that it fits within about TARGET_COLS columns. */
char *format_text (char *text, int in_place, int target_cols, int max_cols);
char *format_text (const char *text, int target_cols, int max_cols);
/*-- mapstrings.c --*/

2
common/t-stringhelp.c
View file

@ -885,7 +885,7 @@ test_format_text (void)
{
struct test *test = &tests[i];
char *result =
format_text (test->input, 0, test->target_cols, test->max_cols);
format_text (test->input, test->target_cols, test->max_cols);
if (strcmp (result, test->expected) != 0)
{
printf ("%s: Test #%d failed.\nExpected: '%s'\nResult: '%s'\n",