From 9f2c19d733fdc1ac604338ff556cacaf0e80c7fb Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 29 Apr 2020 08:59:36 +0000
Subject: [PATCH] Remove accidental debug code.
---
src/syncterm/conn.c | 35 -----------------------------------
src/syncterm/ssh.c | 35 -----------------------------------
src/syncterm/term.c | 35 -----------------------------------
3 files changed, 105 deletions(-)
diff --git a/src/syncterm/conn.c b/src/syncterm/conn.c
index c805c34f00..0ff2794eec 100644
--- a/src/syncterm/conn.c
+++ b/src/syncterm/conn.c
@@ -55,41 +55,6 @@ short unsigned int conn_ports[]={0,513,513,23,0,22,0,0
struct conn_buffer conn_inbuf;
struct conn_buffer conn_outbuf;
-#ifndef NDEBUG
-
-static int dbg_pthread_mutex_lock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_lock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-static int dbg_pthread_mutex_unlock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_unlock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-static int dbg_pthread_mutex_trylock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_trylock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-#define pthread_mutex_lock(a) dbg_pthread_mutex_lock(a, __LINE__)
-#define pthread_mutex_unlock(a) dbg_pthread_mutex_unlock(a, __LINE__)
-#define pthread_mutex_trylock(a) dbg_pthread_trymutex_lock(a, __LINE__)
-
-#endif
-
/* Buffer functions */
struct conn_buffer *create_conn_buf(struct conn_buffer *buf, size_t size)
{
diff --git a/src/syncterm/ssh.c b/src/syncterm/ssh.c
index 11a0caeec5..e4dc8b07ed 100644
--- a/src/syncterm/ssh.c
+++ b/src/syncterm/ssh.c
@@ -23,41 +23,6 @@ CRYPT_SESSION ssh_session;
int ssh_active=FALSE;
pthread_mutex_t ssh_mutex;
-#ifndef NDEBUG
-
-static int dbg_pthread_mutex_lock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_lock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-static int dbg_pthread_mutex_unlock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_unlock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-static int dbg_pthread_mutex_trylock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_trylock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-#define pthread_mutex_lock(a) dbg_pthread_mutex_lock(a, __LINE__)
-#define pthread_mutex_unlock(a) dbg_pthread_mutex_unlock(a, __LINE__)
-#define pthread_mutex_trylock(a) dbg_pthread_trymutex_lock(a, __LINE__)
-
-#endif
-
static void cryptlib_error_message(int status, const char * msg)
{
char str[64];
diff --git a/src/syncterm/term.c b/src/syncterm/term.c
index aa557121b8..ed65f5d25a 100644
--- a/src/syncterm/term.c
+++ b/src/syncterm/term.c
@@ -68,41 +68,6 @@ struct mouse_state {
enum mouse_modes mode;
};
-#ifndef NDEBUG
-
-static int dbg_pthread_mutex_lock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_lock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-static int dbg_pthread_mutex_unlock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_unlock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-static int dbg_pthread_mutex_trylock(pthread_mutex_t *lptr, unsigned line)
-{
- int ret = pthread_mutex_trylock(lptr);
-
- if (ret)
- fprintf(stderr, "pthread_mutex_lock() returned %d at %u\n", ret, line);
- return ret;
-}
-
-#define pthread_mutex_lock(a) dbg_pthread_mutex_lock(a, __LINE__)
-#define pthread_mutex_unlock(a) dbg_pthread_mutex_unlock(a, __LINE__)
-#define pthread_mutex_trylock(a) dbg_pthread_trymutex_lock(a, __LINE__)
-
-#endif
-
void setup_mouse_events(struct mouse_state *ms)
{
ciomouse_setevents(0);
--
GitLab