1.1 --- a/libusbsniff/libusbsniff.c	Sat Nov 05 00:46:43 2011 +0100
     1.2 +++ b/libusbsniff/libusbsniff.c	Sun Jan 22 23:22:23 2012 +0100
     1.3 @@ -87,9 +87,15 @@
     1.4  /*
     1.5   * Library initialization
     1.6   */
     1.7 +static int opened = 0;
     1.8  static void _libwrap_init() __attribute__ ((constructor));
     1.9  static void _libwrap_init()
    1.10  {   
    1.11 +	if (opened) {
    1.12 +	//	printf ("ALREADY DEFINED\n");
    1.13 +		return;
    1.14 +	}
    1.15 +	opened = 1;
    1.16    __usb_open             = dlsym(RTLD_NEXT, "usb_open");
    1.17    __usb_close            = dlsym(RTLD_NEXT, "usb_close");
    1.18    __usb_find_busses      = dlsym(RTLD_NEXT, "usb_find_busses");
    1.19 @@ -98,6 +104,7 @@
    1.20    __usb_control_msg      = dlsym(RTLD_NEXT, "usb_control_msg");
    1.21    __usb_bulk_write       = dlsym(RTLD_NEXT, "usb_bulk_write");
    1.22    __usb_bulk_read        = dlsym(RTLD_NEXT, "usb_bulk_read");
    1.23 +printf ("USBSNF: initialized %p\n", __usb_bulk_write);
    1.24  }
    1.25  
    1.26  static void _libwrap_fini() __attribute__ ((destructor));

     2.1 --- a/src/plug/io/ewf.c	Sat Nov 05 00:46:43 2011 +0100
     2.2 +++ b/src/plug/io/ewf.c	Sun Jan 22 23:22:23 2012 +0100
     2.3 @@ -24,7 +24,7 @@
     2.4  
     2.5  #define EWF_FD 0x19b19b
     2.6  static int ewf_fd = -1;
     2.7 -LIBEWF_HANDLE *ewf_h = NULL;
     2.8 +libewf_handle_t *ewf_h = NULL;
     2.9  
    2.10  int ewf_handle_fd(int fd)
    2.11  {