?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
113.0-1
[arch-packages.git] / cdparanoia / repos / extra-x86_64 / gcc.patch
blobb157353e28656750b6e95680b2408e1c33d9060c
1 Index: interface/test_interface.c
2 ===================================================================
3 --- interface/test_interface.c (Revision 15337)
4 +++ interface/test_interface.c (Revision 15340)
5 @@ -66,9 +66,9 @@
6 if(!fd)fd=fdopen(d->cdda_fd,"r");
7
8 if(begin<lastread)
9 - d->private->last_milliseconds=20;
10 + d->private_data->last_milliseconds=20;
11 else
12 - d->private->last_milliseconds=sectors;
13 + d->private_data->last_milliseconds=sectors;
14
15 #ifdef CDDA_TEST_UNDERRUN
16 sectors-=1;
17 Index: interface/cdda_interface.h
18 ===================================================================
19 --- interface/cdda_interface.h (Revision 15337)
20 +++ interface/cdda_interface.h (Revision 15340)
21 @@ -84,7 +84,7 @@
22 int is_atapi;
23 int is_mmc;
24
25 - cdda_private_data_t *private;
26 + cdda_private_data_t *private_data;
27 void *reserved;
28 unsigned char inqbytes[4];
29
30 Index: interface/interface.c
31 ===================================================================
32 --- interface/interface.c (Revision 15337)
33 +++ interface/interface.c (Revision 15340)
34 @@ -39,9 +39,9 @@
35 if(d->drive_model)free(d->drive_model);
36 if(d->cdda_fd!=-1)close(d->cdda_fd);
37 if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
38 - if(d->private){
39 - if(d->private->sg_hd)free(d->private->sg_hd);
40 - free(d->private);
41 + if(d->private_data){
42 + if(d->private_data->sg_hd)free(d->private_data->sg_hd);
43 + free(d->private_data);
44 }
45
46 free(d);
47 @@ -127,7 +127,7 @@
48 }
49 }
50 }
51 - if(ms)*ms=d->private->last_milliseconds;
52 + if(ms)*ms=d->private_data->last_milliseconds;
53 return(sectors);
54 }
55
56 Index: interface/scsi_interface.c
57 ===================================================================
58 --- interface/scsi_interface.c (Revision 15337)
59 +++ interface/scsi_interface.c (Revision 15340)
60 @@ -15,13 +15,13 @@
61 static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
62 struct timespec tv1;
63 struct timespec tv2;
64 - int ret1=clock_gettime(d->private->clock,&tv1);
65 + int ret1=clock_gettime(d->private_data->clock,&tv1);
66 int ret2=ioctl(fd, command,arg);
67 - int ret3=clock_gettime(d->private->clock,&tv2);
68 + int ret3=clock_gettime(d->private_data->clock,&tv2);
69 if(ret1<0 || ret3<0){
70 - d->private->last_milliseconds=-1;
71 + d->private_data->last_milliseconds=-1;
72 }else{
73 - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
74 + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
75 }
76 return ret2;
77 }
78 @@ -96,7 +96,7 @@
79 static void clear_garbage(cdrom_drive *d){
80 fd_set fdset;
81 struct timeval tv;
82 - struct sg_header *sg_hd=d->private->sg_hd;
83 + struct sg_header *sg_hd=d->private_data->sg_hd;
84 int flag=0;
85
86 /* clear out any possibly preexisting garbage */
87 @@ -185,7 +185,7 @@
88 struct timespec tv2;
89 int tret1,tret2;
90 int status = 0;
91 - struct sg_header *sg_hd=d->private->sg_hd;
92 + struct sg_header *sg_hd=d->private_data->sg_hd;
93 long writebytes=SG_OFF+cmd_len+in_size;
94
95 /* generic scsi device services */
96 @@ -195,7 +195,7 @@
97
98 memset(sg_hd,0,sizeof(sg_hd));
99 memset(sense_buffer,0,SG_MAX_SENSE);
100 - memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
101 + memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
102 sg_hd->twelve_byte = cmd_len == 12;
103 sg_hd->result = 0;
104 sg_hd->reply_len = SG_OFF + out_size;
105 @@ -209,7 +209,7 @@
106 tell if the command failed. Scared yet? */
107
108 if(bytecheck && out_size>in_size){
109 - memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
110 + memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
111 /* the size does not remove cmd_len due to the way the kernel
112 driver copies buffers */
113 writebytes+=(out_size-in_size);
114 @@ -243,7 +243,7 @@
115 }
116
117 sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
118 - tret1=clock_gettime(d->private->clock,&tv1);
119 + tret1=clock_gettime(d->private_data->clock,&tv1);
120 errno=0;
121 status = write(d->cdda_fd, sg_hd, writebytes );
122
123 @@ -289,7 +289,7 @@
124 }
125 }
126
127 - tret2=clock_gettime(d->private->clock,&tv2);
128 + tret2=clock_gettime(d->private_data->clock,&tv2);
129 errno=0;
130 status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
131 sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
132 @@ -313,7 +313,7 @@
133 if(bytecheck && in_size+cmd_len<out_size){
134 long i,flag=0;
135 for(i=in_size;i<out_size;i++)
136 - if(d->private->sg_buffer[i]!=bytefill){
137 + if(d->private_data->sg_buffer[i]!=bytefill){
138 flag=1;
139 break;
140 }
141 @@ -326,9 +326,9 @@
142
143 errno=0;
144 if(tret1<0 || tret2<0){
145 - d->private->last_milliseconds=-1;
146 + d->private_data->last_milliseconds=-1;
147 }else{
148 - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
149 + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
150 }
151 return(0);
152 }
153 @@ -347,7 +347,7 @@
154
155 memset(&hdr,0,sizeof(hdr));
156 memset(sense,0,sizeof(sense));
157 - memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
158 + memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
159
160 hdr.cmdp = cmd;
161 hdr.cmd_len = cmd_len;
162 @@ -355,7 +355,7 @@
163 hdr.mx_sb_len = SG_MAX_SENSE;
164 hdr.timeout = 50000;
165 hdr.interface_id = 'S';
166 - hdr.dxferp = d->private->sg_buffer;
167 + hdr.dxferp = d->private_data->sg_buffer;
168 hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */
169
170 /* scary buffer fill hack */
171 @@ -400,7 +400,7 @@
172 if(bytecheck && in_size<out_size){
173 long i,flag=0;
174 for(i=in_size;i<out_size;i++)
175 - if(d->private->sg_buffer[i]!=bytefill){
176 + if(d->private_data->sg_buffer[i]!=bytefill){
177 flag=1;
178 break;
179 }
180 @@ -412,7 +412,7 @@
181 }
182
183 /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
184 - /* d->private->last_milliseconds = hdr.duration; */
185 + /* d->private_data->last_milliseconds = hdr.duration; */
186
187 errno = 0;
188 return 0;
189 @@ -445,9 +445,9 @@
190
191 handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
192
193 - key = d->private->sg_buffer[2] & 0xf;
194 - ASC = d->private->sg_buffer[12];
195 - ASCQ = d->private->sg_buffer[13];
196 + key = d->private_data->sg_buffer[2] & 0xf;
197 + ASC = d->private_data->sg_buffer[12];
198 + ASCQ = d->private_data->sg_buffer[13];
199
200 if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
201 return 1;
202 @@ -492,7 +492,7 @@
203 if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
204
205 {
206 - unsigned char *b=d->private->sg_buffer;
207 + unsigned char *b=d->private_data->sg_buffer;
208 if(b[0])return(1); /* Handles only up to 256 bytes */
209 if(b[6])return(1); /* Handles only up to 256 bytes */
210
211 @@ -604,8 +604,8 @@
212 static unsigned int get_orig_sectorsize(cdrom_drive *d){
213 if(mode_sense(d,12,0x01))return(-1);
214
215 - d->orgdens = d->private->sg_buffer[4];
216 - return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
217 + d->orgdens = d->private_data->sg_buffer[4];
218 + return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
219 }
220
221 /* switch CDROM scsi drives to given sector size */
222 @@ -664,8 +664,8 @@
223 return(-4);
224 }
225
226 - first=d->private->sg_buffer[2];
227 - last=d->private->sg_buffer[3];
228 + first=d->private_data->sg_buffer[2];
229 + last=d->private_data->sg_buffer[3];
230 tracks=last-first+1;
231
232 if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
233 @@ -683,7 +683,7 @@
234 return(-5);
235 }
236 {
237 - scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
238 + scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
239
240 d->disc_toc[i-first].bFlags=toc->bFlags;
241 d->disc_toc[i-first].bTrack=i;
242 @@ -704,7 +704,7 @@
243 return(-2);
244 }
245 {
246 - scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
247 + scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
248
249 d->disc_toc[i-first].bFlags=toc->bFlags;
250 d->disc_toc[i-first].bTrack=0xAA;
251 @@ -738,7 +738,7 @@
252 }
253
254 /* copy to our structure and convert start sector */
255 - tracks = d->private->sg_buffer[1];
256 + tracks = d->private_data->sg_buffer[1];
257 if (tracks > MAXTRK) {
258 cderror(d,"003: CDROM reporting illegal number of tracks\n");
259 return(-3);
260 @@ -754,33 +754,33 @@
261 return(-5);
262 }
263
264 - d->disc_toc[i].bFlags = d->private->sg_buffer[10];
265 + d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
266 d->disc_toc[i].bTrack = i + 1;
267
268 d->disc_toc[i].dwStartSector= d->adjust_ssize *
269 - (((signed char)(d->private->sg_buffer[2])<<24) |
270 - (d->private->sg_buffer[3]<<16)|
271 - (d->private->sg_buffer[4]<<8)|
272 - (d->private->sg_buffer[5]));
273 + (((signed char)(d->private_data->sg_buffer[2])<<24) |
274 + (d->private_data->sg_buffer[3]<<16)|
275 + (d->private_data->sg_buffer[4]<<8)|
276 + (d->private_data->sg_buffer[5]));
277 }
278
279 d->disc_toc[i].bFlags = 0;
280 d->disc_toc[i].bTrack = i + 1;
281 - memcpy (&foo, d->private->sg_buffer+2, 4);
282 - memcpy (&bar, d->private->sg_buffer+6, 4);
283 + memcpy (&foo, d->private_data->sg_buffer+2, 4);
284 + memcpy (&bar, d->private_data->sg_buffer+6, 4);
285 d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
286 be32_to_cpu(bar));
287
288 d->disc_toc[i].dwStartSector= d->adjust_ssize *
289 - ((((signed char)(d->private->sg_buffer[2])<<24) |
290 - (d->private->sg_buffer[3]<<16)|
291 - (d->private->sg_buffer[4]<<8)|
292 - (d->private->sg_buffer[5]))+
293 + ((((signed char)(d->private_data->sg_buffer[2])<<24) |
294 + (d->private_data->sg_buffer[3]<<16)|
295 + (d->private_data->sg_buffer[4]<<8)|
296 + (d->private_data->sg_buffer[5]))+
297
298 - ((((signed char)(d->private->sg_buffer[6])<<24) |
299 - (d->private->sg_buffer[7]<<16)|
300 - (d->private->sg_buffer[8]<<8)|
301 - (d->private->sg_buffer[9]))));
302 + ((((signed char)(d->private_data->sg_buffer[6])<<24) |
303 + (d->private_data->sg_buffer[7]<<16)|
304 + (d->private_data->sg_buffer[8]<<8)|
305 + (d->private_data->sg_buffer[9]))));
306
307
308 d->cd_extra = FixupTOC(d,tracks+1);
309 @@ -817,7 +817,7 @@
310 cmd[8] = sectors;
311 if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
312 return(ret);
313 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
314 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
315 return(0);
316 }
317
318 @@ -836,7 +836,7 @@
319 cmd[9] = sectors;
320 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
321 return(ret);
322 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
323 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
324 return(0);
325 }
326
327 @@ -854,7 +854,7 @@
328 cmd[8] = sectors;
329 if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
330 return(ret);
331 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
332 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
333 return(0);
334 }
335
336 @@ -872,7 +872,7 @@
337 cmd[9] = sectors;
338 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
339 return(ret);
340 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
341 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
342 return(0);
343 }
344
345 @@ -890,7 +890,7 @@
346 cmd[8] = sectors;
347 if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
348 return(ret);
349 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
350 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
351 return(0);
352 }
353
354 @@ -908,7 +908,7 @@
355 cmd[9] = sectors;
356 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
357 return(ret);
358 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
359 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
360 return(0);
361 }
362
363 @@ -922,7 +922,7 @@
364 cmd[8] = sectors;
365 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
366 return(ret);
367 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
368 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
369 return(0);
370 }
371
372 @@ -936,7 +936,7 @@
373 cmd[8] = sectors;
374 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
375 return(ret);
376 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
377 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
378 return(0);
379 }
380
381 @@ -950,7 +950,7 @@
382 cmd[8] = sectors;
383 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
384 return(ret);
385 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
386 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
387 return(0);
388 }
389
390 @@ -964,7 +964,7 @@
391 cmd[8] = sectors;
392 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
393 return(ret);
394 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
395 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
396 return(0);
397 }
398
399 @@ -978,7 +978,7 @@
400 cmd[8] = sectors;
401 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
402 return(ret);
403 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
404 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
405 return(0);
406 }
407
408 @@ -992,7 +992,7 @@
409 cmd[8] = sectors;
410 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
411 return(ret);
412 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
413 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
414 return(0);
415 }
416
417 @@ -1026,7 +1026,7 @@
418
419 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
420 return(ret);
421 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
422 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
423 return(0);
424 }
425
426 @@ -1039,7 +1039,7 @@
427
428 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
429 return(ret);
430 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
431 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
432 return(0);
433 }
434
435 @@ -1052,7 +1052,7 @@
436
437 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
438 return(ret);
439 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
440 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
441 return(0);
442 }
443
444 @@ -1275,7 +1275,7 @@
445 static int count_2352_bytes(cdrom_drive *d){
446 long i;
447 for(i=2351;i>=0;i--)
448 - if(d->private->sg_buffer[i]!=(unsigned char)'\177')
449 + if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
450 return(((i+3)>>2)<<2);
451
452 return(0);
453 @@ -1284,7 +1284,7 @@
454 static int verify_nonzero(cdrom_drive *d){
455 long i,flag=0;
456 for(i=0;i<2352;i++)
457 - if(d->private->sg_buffer[i]!=0){
458 + if(d->private_data->sg_buffer[i]!=0){
459 flag=1;
460 break;
461 }
462 @@ -1621,7 +1621,7 @@
463 d->is_mmc=0;
464 if(mode_sense(d,22,0x2A)==0){
465
466 - b=d->private->sg_buffer;
467 + b=d->private_data->sg_buffer;
468 b+=b[3]+4;
469
470 if((b[0]&0x3F)==0x2A){
471 @@ -1669,7 +1669,7 @@
472 cderror(d,"008: Unable to identify CDROM model\n");
473 return(NULL);
474 }
475 - return (d->private->sg_buffer);
476 + return (d->private_data->sg_buffer);
477 }
478
479 int scsi_init_drive(cdrom_drive *d){
480 @@ -1725,8 +1725,8 @@
481 check_cache(d);
482
483 d->error_retry=1;
484 - d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
485 - d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
486 + d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
487 + d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
488 d->report_all=1;
489 return(0);
490 }
491 Index: interface/cooked_interface.c
492 ===================================================================
493 --- interface/cooked_interface.c (Revision 15337)
494 +++ interface/cooked_interface.c (Revision 15340)
495 @@ -13,13 +13,13 @@
496 static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
497 struct timespec tv1;
498 struct timespec tv2;
499 - int ret1=clock_gettime(d->private->clock,&tv1);
500 + int ret1=clock_gettime(d->private_data->clock,&tv1);
501 int ret2=ioctl(fd, command,arg);
502 - int ret3=clock_gettime(d->private->clock,&tv2);
503 + int ret3=clock_gettime(d->private_data->clock,&tv2);
504 if(ret1<0 || ret3<0){
505 - d->private->last_milliseconds=-1;
506 + d->private_data->last_milliseconds=-1;
507 }else{
508 - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
509 + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
510 }
511 return ret2;
512 }
513 Index: interface/scan_devices.c
514 ===================================================================
515 --- interface/scan_devices.c (Revision 15337)
516 +++ interface/scan_devices.c (Revision 15340)
517 @@ -264,11 +264,11 @@
518 d->interface=COOKED_IOCTL;
519 d->bigendianp=-1; /* We don't know yet... */
520 d->nsectors=-1;
521 - d->private=calloc(1,sizeof(*d->private));
522 + d->private_data=calloc(1,sizeof(*d->private_data));
523 {
524 /* goddamnit */
525 struct timespec tv;
526 - d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
527 + d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
528 }
529 idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
530 return(d);
531 @@ -674,15 +674,15 @@
532 d->bigendianp=-1; /* We don't know yet... */
533 d->nsectors=-1;
534 d->messagedest = messagedest;
535 - d->private=calloc(1,sizeof(*d->private));
536 + d->private_data=calloc(1,sizeof(*d->private_data));
537 {
538 /* goddamnit */
539 struct timespec tv;
540 - d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
541 + d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
542 }
543 if(use_sgio){
544 d->interface=SGIO_SCSI;
545 - d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
546 + d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
547 g_fd=d->cdda_fd=dup(d->ioctl_fd);
548 }else{
549 version=verify_SG_version(d,messagedest,messages);
550 @@ -696,8 +696,8 @@
551 }
552
553 /* malloc our big buffer for scsi commands */
554 - d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
555 - d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
556 + d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
557 + d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
558 }
559
560 {
561 @@ -772,9 +772,9 @@
562 if(i_fd!=-1)close(i_fd);
563 if(g_fd!=-1)close(g_fd);
564 if(d){
565 - if(d->private){
566 - if(d->private->sg_hd)free(d->private->sg_hd);
567 - free(d->private);
568 + if(d->private_data){
569 + if(d->private_data->sg_hd)free(d->private_data->sg_hd);
570 + free(d->private_data);
571 }
572 free(d);
573 }
574 @@ -821,7 +821,7 @@
575 d->interface=TEST_INTERFACE;
576 d->bigendianp=-1; /* We don't know yet... */
577 d->nsectors=-1;
578 - d->private=calloc(1,sizeof(*d->private));
579 + d->private_data=calloc(1,sizeof(*d->private_data));
580 d->drive_model=copystring("File based test interface");
581 idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
582
archlinux package build