kopia lustrzana https://gitlab.com/sane-project/backends
				
				
				
			Call sanei_usb_init only once.
							rodzic
							
								
									99a1cf050f
								
							
						
					
					
						commit
						08af36a2e8
					
				|  | @ -9,6 +9,7 @@ | |||
| 	  in sane_init to avoid segmentation faults when sane_init/sane_exit is | ||||
| 	  run more than once. | ||||
| 	* doc/descriptions-external/ibm.desc: Add Ricoh IS-420. | ||||
| 	* sanei/sanei_usb.c: Call sanei_usb_init only once. | ||||
| 
 | ||||
| 2003-02-20  Henning Meier-Geinitz <henning@meier-geinitz.de> | ||||
| 
 | ||||
|  |  | |||
|  | @ -129,6 +129,7 @@ struct ctrlmsg_ioctl | |||
| cmsg; | ||||
| #endif /* __linux__ */ | ||||
| 
 | ||||
| static SANE_Bool inited = SANE_FALSE; | ||||
| 
 | ||||
| static void | ||||
| kernel_get_vendor_product (int fd, int *vendorID, int *productID) | ||||
|  | @ -173,6 +174,11 @@ sanei_usb_init (void) | |||
|   struct usb_device *dev; | ||||
| #endif /* HAVE_LIBUSB */ | ||||
| 
 | ||||
|   if (inited) | ||||
|     return SANE_STATUS_GOOD; | ||||
| 
 | ||||
|   inited = SANE_TRUE; | ||||
| 
 | ||||
|   DBG_INIT (); | ||||
|   memset (devices, 0, sizeof (devices)); | ||||
| 
 | ||||
|  | @ -213,7 +219,7 @@ sanei_usb_init (void) | |||
| 	      fd = open (devname, O_RDWR); | ||||
| 	      if (fd < 0) | ||||
| 		{ | ||||
| 		  DBG(5, "sanei_usb_init: couldn't open %s: %s\n", devname, | ||||
| 		  DBG (5, "sanei_usb_init: couldn't open %s: %s\n", devname, | ||||
| 		      strerror (errno)); | ||||
| 		  continue; | ||||
| 		} | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 Henning Geinitz
						Henning Geinitz