diff --git a/src/syncterm/conn.c b/src/syncterm/conn.c index c805c34f003199c7a7ecac550779c1c23ec5e94e..0ff2794eecd4afa9236fd4c734d0ab9e3524ffd5 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 11a0caeec5125d1a12be42b5a359a4df3130b41f..e4dc8b07ed81ec7a1134523b0da441af34b7fdf7 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 aa557121b84d5cd524816dc9310308bf5f0f6058..ed65f5d25af5670057f86aa34b3d373841793bca 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);