Trying to isolate old char * code.

render.cpp

@@ -613,6 +613,7 @@ void render_effect(int fd, char ch) {
   }
 }
 
+#ifdef UNWANTED
 /**
  * render( fd, string_out )
  *
@@ -671,6 +672,7 @@ void render(int fd, const char *string_out, int len) {
     cp++;
   }
 }
+#endif
 
 /**
  * render( fd, string_out )
@@ -679,7 +681,7 @@ void render(int fd, const char *string_out, int len) {
  * Handles TRIGGER.
  * Renders with effects.
  */
-void render(int fd, std::string string_out) {
+void render(int fd, std::string &string_out) {
   reset_render();
   time_t start = time(NULL);
   size_t pos = 0;

render.h

@@ -19,8 +19,10 @@ int send_file(int fd, int x, int y, char *filename);
 const char *process_trigger(int fd, const char *cp);
 void process_trigger(int fd, std::string str, size_t &pos);
 void render_effect(int fd, char ch);
+/*
 void render(int fd, const char *string_out, int len);
-void render(int fd, std::string string_out);
+*/
+void render(int fd, std::string &string_out);
 void render_image(const char **lines, int size);
 
 #define TRIGGER "^"

terminal.cpp

@@ -364,12 +364,14 @@ termchar console_char(struct console_details *cdp, char ch) {
   }
 }
 
+#ifdef UNWANTED
 void console_string(struct console_details *cdp, const char *chars) {
   int x;
   for (x = 0; x < strlen(chars); x++) {
     console_char(cdp, chars[x]);
   }
 }
+#endif
 
 // extern void log_flush(void);
 
@@ -388,6 +390,7 @@ void console_receive(struct console_details *cdp, std::string chars) {
     console_char(cdp, *strit);
 }
 
+#ifdef UNWANTED
 void console_receive(struct console_details *cdp, const char *chars, int len) {
   int x;
 
@@ -395,3 +398,4 @@ void console_receive(struct console_details *cdp, const char *chars, int len) {
     console_char(cdp, chars[x]);
   }
 }
+#endif

terminal.h

@@ -28,7 +28,10 @@ const char *color_restore(struct console_details *cdp);
 ANSI_TYPE console_ansi(struct console_details *cdp, const char *ansi);
 
 termchar console_char(struct console_details *cdp, char ch);
+void console_receive(struct console_details *cdp, std::string chars);
+
+/*   // These should no longer be needed or used //
 void console_string(struct console_details *cdp, const char *chars);
 void console_receive(struct console_details *cdp, const char *chars, int len);
-void console_receive(struct console_details *cdp, std::string chars);
+*/
 #endif

wordplay.cpp

@@ -301,6 +301,8 @@ int buffer_insert(char *buffer, int len, int max_length, int pos,
   return 1;
 }
 
+#ifdef UNWANTED
+
 /*
  * The buffer that we've been given is much larger now.
  *
@@ -676,6 +678,7 @@ int harry_happens(time_t *last_event, int wakeup) {
   }
   return 0;
 }
+#endif // UNWANTED
 
 int mangle_clrscr(std::string &buffer, std::string &work, size_t pos) {
   static int ANSI_CLS_count = 0;