From 16a8d554809171156ed2727c6e1f4e2fdff5b5e3 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Fri, 10 May 2019 21:05:51 +0300 Subject: [PATCH] Don't use strings that are similar to conflict markers in debug msgs --- backend/plustek.c | 2 +- backend/plustek_pp.c | 2 +- backend/snapscan.c | 2 +- backend/u12.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/plustek.c b/backend/plustek.c index 21e984564..e1d9e0914 100644 --- a/backend/plustek.c +++ b/backend/plustek.c @@ -574,7 +574,7 @@ do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe ) if( sanei_thread_is_valid (scanner->reader_pid) ) { - DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" ); + DBG( _DBG_PROC, "---- killing reader_process ----\n" ); cancelRead = SANE_TRUE; scanner->calibrating = SANE_FALSE; diff --git a/backend/plustek_pp.c b/backend/plustek_pp.c index e1d4c02f7..551cf279c 100644 --- a/backend/plustek_pp.c +++ b/backend/plustek_pp.c @@ -473,7 +473,7 @@ static SANE_Status do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe ) if( sanei_thread_is_valid( scanner->reader_pid )) { - DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" ); + DBG( _DBG_PROC, "---- killing reader_process ----\n" ); /* tell the driver to stop scanning */ if( -1 != scanner->hw->fd ) { diff --git a/backend/snapscan.c b/backend/snapscan.c index d9054ebbb..b93f1f7dc 100644 --- a/backend/snapscan.c +++ b/backend/snapscan.c @@ -1871,7 +1871,7 @@ void sane_cancel (SANE_Handle h) /* signal the reader, if any */ if (sanei_thread_is_valid (pss->child)) { - DBG( DL_INFO, ">>>>>>>> killing reader_process <<<<<<<<\n" ); + DBG( DL_INFO, "---- killing reader_process ----\n" ); sigemptyset(&(act.sa_mask)); act.sa_flags = 0; diff --git a/backend/u12.c b/backend/u12.c index 78e917573..57e1f637c 100644 --- a/backend/u12.c +++ b/backend/u12.c @@ -393,7 +393,7 @@ static SANE_Status do_cancel( U12_Scanner *scanner, SANE_Bool closepipe ) if( sanei_thread_is_valid (scanner->reader_pid) ) { - DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" ); + DBG( _DBG_PROC, "---- killing reader_process ----\n" ); cancelRead = SANE_TRUE;