From cdf2ee5c8a39e38380f10480639adebc5a108ce5 Mon Sep 17 00:00:00 2001 From: sk-5 Date: Tue, 14 Jul 2015 08:21:05 -0700 Subject: [PATCH] pcsprintf --- examples/example | Bin 8904 -> 0 bytes examples/example2 | Bin 8397 -> 0 bytes examples/example2.cpp | 11 ++++++++--- libpipecolors.cpp | 39 ++++++++++++++++++++++----------------- pcprintf.3 | 4 ++-- pipecolors.h | 2 +- 6 files changed, 33 insertions(+), 23 deletions(-) delete mode 100755 examples/example delete mode 100755 examples/example2 diff --git a/examples/example b/examples/example deleted file mode 100755 index 7249736ecdd6e043ddaac9cc2061bf830f4cc48a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8904 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 Y%G5_551(JO%qz9OM=8v^oV(lqH*7La0ssI2 diff --git a/examples/example2 b/examples/example2 deleted file mode 100755 index 155367f5221aaa407b55d0ebbd32cf7d4b273358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8397 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 result = replace_colors(s); - //char* buffer = result.first; - - return s.length(); + std::string s(*str1); + free(*str1); + std::pair result = replace_colors(s); + const char * s2 = (const char *)result.first.c_str(); + strcpy(str, s2); + return result.second; } } // namespace diff --git a/pcprintf.3 b/pcprintf.3 index 6650885..2679582 100644 --- a/pcprintf.3 +++ b/pcprintf.3 @@ -32,9 +32,9 @@ pcsprintf \- convert pipecode (|10) to ansi colors .sp .B using namespace pipecolors; .sp -.BI "int pcprintf(const char *" format ", ...);" +.BI "int pcprintf(const char * " format ", ...);" .br -.BI "int pcsprintf(char *" str ", const char *" format ", ...);" +.BI "int pcsprintf(char * " str ", const char * " format ", ...);" .sp .in -4n .ad diff --git a/pipecolors.h b/pipecolors.h index c571788..ddee655 100644 --- a/pipecolors.h +++ b/pipecolors.h @@ -11,7 +11,7 @@ extern "C" { #endif int pcprintf( const char * format, ... ); -int pcsprintf( char * str, const char * fmt, ... ); +int pcsprintf( char * str, const char * format, ... ); #ifdef __cplusplus }