summaryrefslogtreecommitdiff
path: root/print/hplip/files/patch-scan_sane_io.c
blob: 4a553d26fefb4d759c569f1d27a0b780c2f0ce3f (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
--- scan/sane/io.c.orig	Tue May 23 15:15:04 2006
+++ scan/sane/io.c	Tue May 23 15:17:40 2006
@@ -210,6 +210,13 @@
 {
     char message[ BUFFER_SIZE ];
     MsgAttributes ma;
+    int remaining;
+    char *p;
+    int state = 0;
+    int d = 0;
+    char * uri = NULL; 
+    char * mdl = NULL;      
+
 
     int len = sprintf( message, "msg=ProbeDevicesFiltered\nbus=%s\nfilter=scan\nformat=default\n", 
         "usb,cups,par" );
@@ -228,18 +235,14 @@
 
     hplip_ParseMsg( message, len, &ma );
 
-    int d = 0;
-    char * uri = NULL;
-    char * mdl = NULL;
-    
     if( ma.ndevice > 0 )
     {
         *devices = malloc( sizeof( SANE_Device * ) * ( ma.ndevice + 1 ) );
 
-        int remaining = ma.length;
-        char *p = (char *)ma.data;
+        remaining = ma.length;
+        p = (char *)ma.data;
 
-        int state = 0;
+        state = 0;
 
         while( remaining > 0 && *p != '\0' && d < ma.ndevice )
         {