mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update to snapscan-20011218 (snapscan 1.4.3)

DEVEL_2_0_BRANCH-1
Oliver Schwartz 2001-12-18 18:34:17 +00:00
rodzic 6f5b9f57a3
commit c09fc6b8e7
2 zmienionych plików z 10 dodań i 32 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

34
backend/snapscan.c
Wyświetl plik

@ -1407,32 +1407,6 @@ SANE_Status sane_open (SANE_String_Const name, SANE_Handle * h)
return SANE_STATUS_NO_MEM; return SANE_STATUS_NO_MEM;
} }
/* temp file name and the temp file */
{
char tname[128];
snprintf (tname,
sizeof (tname),
TMP_FILE_PREFIX "-%p",
(void *) pss);
if ((pss->tfd = open (tname, O_CREAT | O_RDWR | O_TRUNC, 0600)) == -1)
{
char str[200];
snprintf (str, sizeof (str), "Can't open temp file %s", tname);
DBG (DL_MAJOR_ERROR, "%s: %s\n", me, str);
perror (str);
free (*h);
return SANE_STATUS_ACCESS_DENIED;
}
unlink (tname);
pss->tmpfname = strdup (tname);
if (!pss->tmpfname)
{
DBG (DL_MAJOR_ERROR, "%s: can't duplicate temp file name\n", me);
free (*h);
return SANE_STATUS_NO_MEM;
}
}
DBG (DL_VERBOSE, DBG (DL_VERBOSE,
"%s: allocated scanner structure at %p\n", "%s: allocated scanner structure at %p\n",
me, me,
@ -1536,7 +1510,6 @@ void sane_close (SANE_Handle h)
break; break;
} }
close_scanner (pss); close_scanner (pss);
close (pss->tfd);
free (pss->tmpfname); free (pss->tmpfname);
free (pss->gamma_tables); free (pss->gamma_tables);
free (pss->buf); free (pss->buf);
@ -3128,8 +3101,11 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
/* /*
* $Log$ * $Log$
* Revision 1.11 2001/12/17 22:51:51 oliverschwartz * Revision 1.12 2001/12/18 18:34:16 oliverschwartz
* Update to snapscan-20011212 (snapscan 1.4.3) * Update to snapscan-20011218 (snapscan 1.4.3)
*
* Revision 1.34 2001/12/18 18:28:35 oliverschwartz
* Removed temporary file
* *
* Revision 1.33 2001/12/12 19:43:30 oliverschwartz * Revision 1.33 2001/12/12 19:43:30 oliverschwartz
* - Set version number to 1.4.3 * - Set version number to 1.4.3

8
backend/snapscan.h
Wyświetl plik

@ -257,7 +257,6 @@ struct snapscan_scanner
int fd; /* scsi file descriptor */ int fd; /* scsi file descriptor */
int opens; /* open count */ int opens; /* open count */
SANE_String tmpfname; /* temporary file name */ SANE_String tmpfname; /* temporary file name */
int tfd; /* temp file descriptor */
int rpipe[2]; /* reader pipe descriptors */ int rpipe[2]; /* reader pipe descriptors */
int orig_rpipe_flags; /* initial reader pipe flags */ int orig_rpipe_flags; /* initial reader pipe flags */
pid_t child; /* child reader process pid */ pid_t child; /* child reader process pid */
@ -325,8 +324,11 @@ struct snapscan_scanner
/* /*
* $Log$ * $Log$
* Revision 1.8 2001/12/17 22:51:52 oliverschwartz * Revision 1.9 2001/12/18 18:34:17 oliverschwartz
* Update to snapscan-20011212 (snapscan 1.4.3) * Update to snapscan-20011218 (snapscan 1.4.3)
*
* Revision 1.25 2001/12/18 18:28:35 oliverschwartz
* Removed temporary file
* *
* Revision 1.24 2001/12/12 19:44:59 oliverschwartz * Revision 1.24 2001/12/12 19:44:59 oliverschwartz
* Clean up CVS log * Clean up CVS log