From 51ee78ee5528e8c6d8f52b646d17713bfae0302d Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Wed, 2 Oct 2024 04:34:27 -0400
Subject: [PATCH] move grow_esc_table() out of header, eliminate c++ cast

---
 src/lib/termdesc.c | 34 ++++++++++++++++++++++++++++++++++
 src/lib/termdesc.h | 36 ++----------------------------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/lib/termdesc.c b/src/lib/termdesc.c
index 308026de0..74e7356d9 100644
--- a/src/lib/termdesc.c
+++ b/src/lib/termdesc.c
@@ -8,6 +8,40 @@
 #include "windows.h"
 #include "linux.h"
 
+// tlen -- size of escape table. tused -- used bytes in same.
+// returns -1 if the starting location is >= 65535. otherwise,
+// copies tstr into the table, and sets up 1-biased index.
+int grow_esc_table(tinfo* ti, const char* tstr, escape_e esc,
+                   size_t* tlen, size_t* tused){
+  // the actual table can grow past 64KB, but we can't start there, as
+  // we only have 16-bit indices.
+  if(*tused >= 65535){
+    fprintf(stderr, "Can't add escape %d to full table\n", esc);
+    return -1;
+  }
+  if(get_escape(ti, esc)){
+    fprintf(stderr, "Already defined escape %d (%s)\n",
+            esc, get_escape(ti, esc));
+    return -1;
+  }
+  size_t slen = strlen(tstr) + 1; // count the nul term
+  if(*tlen - *tused < slen){
+    // guaranteed to give us enough space to add tstr (and then some)
+    size_t newsize = *tlen + 4020 + slen; // don't pull two pages ideally
+    char* tmp = realloc(ti->esctable, newsize);
+    if(tmp == NULL){
+      return -1;
+    }
+    ti->esctable = tmp;
+    *tlen = newsize;
+  }
+  // we now are guaranteed sufficient space to copy tstr
+  memcpy(ti->esctable + *tused, tstr, slen);
+  ti->escindices[esc] = *tused + 1; // one-bias
+  *tused += slen;
+  return 0;
+}
+
 // there does not exist any true standard terminal size. with that said, we
 // need assume *something* for the case where we're not actually attached to
 // a terminal (mainly unit tests, but also daemon environments). in preference
diff --git a/src/lib/termdesc.h b/src/lib/termdesc.h
index 98d2eed88..9d7bf5658 100644
--- a/src/lib/termdesc.h
+++ b/src/lib/termdesc.h
@@ -252,40 +252,8 @@ char* termdesc_longterm(const tinfo* ti);
 
 int locate_cursor(tinfo* ti, unsigned* cursor_y, unsigned* cursor_x);
 
-// tlen -- size of escape table. tused -- used bytes in same.
-// returns -1 if the starting location is >= 65535. otherwise,
-// copies tstr into the table, and sets up 1-biased index.
-static inline int
-grow_esc_table(tinfo* ti, const char* tstr, escape_e esc,
-               size_t* tlen, size_t* tused){
-  // the actual table can grow past 64KB, but we can't start there, as
-  // we only have 16-bit indices.
-  if(*tused >= 65535){
-    fprintf(stderr, "Can't add escape %d to full table\n", esc);
-    return -1;
-  }
-  if(get_escape(ti, esc)){
-    fprintf(stderr, "Already defined escape %d (%s)\n",
-            esc, get_escape(ti, esc));
-    return -1;
-  }
-  size_t slen = strlen(tstr) + 1; // count the nul term
-  if(*tlen - *tused < slen){
-    // guaranteed to give us enough space to add tstr (and then some)
-    size_t newsize = *tlen + 4020 + slen; // don't pull two pages ideally
-    char* tmp = (char*)realloc(ti->esctable, newsize); // cast for c++
-    if(tmp == NULL){
-      return -1;
-    }
-    ti->esctable = tmp;
-    *tlen = newsize;
-  }
-  // we now are guaranteed sufficient space to copy tstr
-  memcpy(ti->esctable + *tused, tstr, slen);
-  ti->escindices[esc] = *tused + 1; // one-bias
-  *tused += slen;
-  return 0;
-}
+int grow_esc_table(tinfo* ti, const char* tstr, escape_e esc,
+                   size_t* tlen, size_t* tused);
 
 static inline int
 ncfputs(const char* ext, FILE* out){