sm3600 warningless <eichholz@computer.org>

DEVEL_2_0_BRANCH-1
Marian Eichholz 2002-04-18 18:11:23 +00:00
rodzic edfe66c274
commit a1641eaedc
2 zmienionych plików z 7 dodań i 2 usunięć

Wyświetl plik

@ -336,7 +336,8 @@ RegisterSaneDev (struct usb_device *pdevUSB, TModel model, char *szName){
return SANE_STATUS_NO_MEM;
memset (q, 0, sizeof (*q)); /* clear every field */
q->sane.name = strdup (szName);
q->szSaneName = strdup (szName);
q->sane.name = (SANE_String_Const) q->szSaneName;
q->sane.vendor = "Microtek";
q->sane.model = "ScanMaker 3600";
q->sane.type = "flatbed scanner";
@ -421,7 +422,7 @@ sane_exit (void)
for (dev = pdevFirst; dev; dev = pNext)
{
pNext = dev->pNext;
free (dev->sane.name);
free (dev->szSaneName);
free (dev);
}
if (devlist) free(devlist);

Wyświetl plik

@ -172,6 +172,7 @@ typedef struct TDevice {
struct usb_device *pdev;
TModel model;
SANE_Device sane;
char *szSaneName;
} TDevice;
#endif
@ -310,7 +311,10 @@ __SM3600EXPORT__ TState StartScanGray(TInstance *this);
__SM3600EXPORT__ TState StartScanColor(TInstance *this);
/* sm3600-homerun.c */
#ifdef INSANE_VERSION
__SM3600EXPORT__ TState FakeCalibration(TInstance *this);
#endif
__SM3600EXPORT__ TState DoOriginate(TInstance *this, TBool bStepOut);
__SM3600EXPORT__ TState DoJog(TInstance *this,int nDistance);