diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:20 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:20 +0200 |
commit | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch) | |
tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/sm3600-scanutil.c | |
parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
parent | 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff) |
Update upstream source from tag 'upstream/1.0.28'
Update to upstream version '1.0.28'
with Debian dir ec5bb298266630fc3801ff6dc0c258f6df7ba979
Diffstat (limited to 'backend/sm3600-scanutil.c')
-rw-r--r-- | backend/sm3600-scanutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/sm3600-scanutil.c b/backend/sm3600-scanutil.c index 62ba0f1..022984e 100644 --- a/backend/sm3600-scanutil.c +++ b/backend/sm3600-scanutil.c @@ -97,7 +97,7 @@ int SetError(TInstance *this, int nError, const char *szFormat, ...) if (this->nErrorState) return 0; /* do not overwrite error state */ this->nErrorState=nError; this->szErrorReason=malloc(500); - + if (szFormat!=NULL && this->szErrorReason) { va_start(ap,szFormat); @@ -200,7 +200,7 @@ TState CancelScan(TInstance *this) usleep(200); DoReset(this); EndScan(this); /* and step back! */ - + DBG(DEBUG_JUNK,"cs4: %d\n",(int)this->nErrorState); bCanceled=this->state.bCanceled; this->state.bCanceled=false; /* re-enable Origination! */ |