{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1753164787, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"362e591ecb58966ee6f1bb52e17d3995", "commit": {"type":"commit", "time": 1493387986, "time_ofs": 120, "oid_tree": { "oid": "ca2db045ffbfa71b877b2e2ad6086c6f54123258", "alias": []}, "oid":{ "oid": "0918b94c9c01307a1cc4cfc347d458827e30ffea", "alias": []}, "msg": "testutil: Remove test_puts_std{out,err}, they are superfluous", "sig_commit": { "git_time": { "time": 1493387986, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }, "sig_author": { "git_time": { "time": 1493386855, "offset": 120 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }}, "body": "testutil: Remove test_puts_std{out,err}, they are superfluous\n\nReviewed-by: Andy Polyakov \u003cappro@openssl.org\u003e\nReviewed-by: Rich Salz \u003crsalz@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/3345)" , "diff": "diff --git a/test/bioprinttest.c b/test/bioprinttest.c\nindex 8ae0a5a..3034cda 100644\n--- a/test/bioprinttest.c\n+++ b/test/bioprinttest.c\n@@ -261,18 +261,6 @@ void test_close_streams(void)\n {\n }\n \n-int test_puts_stdout(const char *str)\n-{\n- return fputs(str, stdout);\n-}\n-\n-int test_puts_stderr(const char *str)\n-{\n- return fputs(str, stderr);\n-}\n-\n-static char vprint_buf[10240];\n-\n /*\n * This works out as long as caller doesn't use any \u0022fancy\u0022 formats.\n * But we are caller's caller, and test_str_eq is the only one called,\n@@ -280,20 +268,12 @@ static char vprint_buf[10240];\n */\n int test_vprintf_stdout(const char *fmt, va_list ap)\n {\n- size_t len \u003d vsnprintf(vprint_buf, sizeof(vprint_buf), fmt, ap);\n-\n- if (len \u003e\u003d sizeof(vprint_buf))\n- return -1;\n- return test_puts_stdout(vprint_buf);\n+ return vfprintf(stdout, fmt, ap);\n }\n \n int test_vprintf_stderr(const char *fmt, va_list ap)\n {\n- size_t len \u003d vsnprintf(vprint_buf, sizeof(vprint_buf), fmt, ap);\n-\n- if (len \u003e\u003d sizeof(vprint_buf))\n- return -1;\n- return test_puts_stderr(vprint_buf);\n+ return vfprintf(stderr, fmt, ap);\n }\n \n int test_flush_stdout(void)\ndiff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c\nindex 8cf5def..6e1f99a 100644\n--- a/test/testutil/basic_output.c\n+++ b/test/testutil/basic_output.c\n@@ -31,16 +31,6 @@ void test_close_streams(void)\n BIO_free(bio_err);\n }\n \n-int test_puts_stdout(const char *str)\n-{\n- return BIO_puts(bio_out, str);\n-}\n-\n-int test_puts_stderr(const char *str)\n-{\n- return BIO_puts(bio_err, str);\n-}\n-\n int test_vprintf_stdout(const char *fmt, va_list ap)\n {\n return BIO_vprintf(bio_out, fmt, ap);\ndiff --git a/test/testutil/output.h b/test/testutil/output.h\nindex 1ca12d2..7c03aff 100644\n--- a/test/testutil/output.h\n+++ b/test/testutil/output.h\n@@ -19,8 +19,6 @@\n void test_open_streams(void);\n void test_close_streams(void);\n /* The following ALL return the number of characters written */\n-int test_puts_stdout(const char *str);\n-int test_puts_stderr(const char *str);\n int test_vprintf_stdout(const char *fmt, va_list ap);\n int test_vprintf_stderr(const char *fmt, va_list ap);\n /* These return failure or success */\ndiff --git a/test/testutil/test_main.c b/test/testutil/test_main.c\nindex 7c9843c..3fa08b6 100644\n--- a/test/testutil/test_main.c\n+++ b/test/testutil/test_main.c\n@@ -15,7 +15,7 @@\n int test_main(int argc, char *argv[])\n {\n if (argc \u003e 1)\n- test_puts_stderr(\u0022Warning: ignoring extra command-line arguments.\u005cn\u0022);\n+ test_printf_stderr(\u0022Warning: ignoring extra command-line arguments.\u005cn\u0022);\n \n register_tests();\n return run_tests(argv[0]);\ndiff --git a/test/testutil/tests.c b/test/testutil/tests.c\nindex 0efaa06..19a366f 100644\n--- a/test/testutil/tests.c\n+++ b/test/testutil/tests.c\n@@ -49,19 +49,17 @@ static void test_fail_message(const char *prefix, const char *file, int line,\n static void test_fail_message_va(const char *prefix, const char *file, int line,\n const char *type, const char *fmt, va_list ap)\n {\n- test_printf_stderr(\u0022%*s# \u0022, subtest_level(), \u0022\u0022);\n- test_puts_stderr(prefix !\u003d NULL ? prefix : \u0022ERROR\u0022);\n- test_puts_stderr(\u0022:\u0022);\n+ test_printf_stderr(\u0022%*s# %s: \u0022, subtest_level(), \u0022\u0022,\n+ prefix !\u003d NULL ? prefix : \u0022ERROR\u0022);\n if (type)\n- test_printf_stderr(\u0022 (%s)\u0022, type);\n+ test_printf_stderr(\u0022(%s)\u0022, type);\n if (fmt !\u003d NULL) {\n- test_puts_stderr(\u0022 \u0022);\n test_vprintf_stderr(fmt, ap);\n }\n if (file !\u003d NULL) {\n test_printf_stderr(\u0022 @ %s:%d\u0022, file, line);\n }\n- test_puts_stderr(\u0022\u005cn\u0022);\n+ test_printf_stderr(\u0022\u005cn\u0022);\n test_flush_stderr();\n }\n \n","s":{"c":1753164787,"u": 31151}} ],"g": 32380,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}