wok-next view cdparanoia/stuff/patches/cdparanoia-III-10.2-gcc_fixes-1.patch @ rev 21722

efivar: typo in post_install
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 01 10:31:46 2020 +0000 (2020-09-01)
parents b2efa70e9283
children
line source
1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
2 Date: 2008-12-03
3 Initial Package Version: III-10.2
4 Upstream Status: unknown
5 Origin: gentoo, who describe it as a gcc-4.3 patch
6 Description: Renames a variable from 'private' to 'private_data'. This is
7 apparently intended to allow the package to be compiled with gcc-4.3 and later.
8 The header file cdda_interface.h is used by c++ code in kdemultimedia-4.1.2
9 which barfs on the use of private _even_in_g++-4.2.2_.
10
11 diff -urp cdparanoia-III-10.2.orig/interface/cdda_interface.h cdparanoia-III-10.2/interface/cdda_interface.h
12 --- cdparanoia-III-10.2.orig/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100
13 +++ cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-25 00:18:02.000000000 +0100
14 @@ -84,7 +84,7 @@ typedef struct cdrom_drive{
15 int is_atapi;
16 int is_mmc;
17
18 - cdda_private_data_t *private;
19 + cdda_private_data_t *private_data;
20 void *reserved;
21 unsigned char inqbytes[4];
22
23 diff -urp cdparanoia-III-10.2.orig/interface/cooked_interface.c cdparanoia-III-10.2/interface/cooked_interface.c
24 --- cdparanoia-III-10.2.orig/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100
25 +++ cdparanoia-III-10.2/interface/cooked_interface.c 2008-09-25 00:19:21.000000000 +0100
26 @@ -13,13 +13,13 @@
27 static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
28 struct timespec tv1;
29 struct timespec tv2;
30 - int ret1=clock_gettime(d->private->clock,&tv1);
31 + int ret1=clock_gettime(d->private_data->clock,&tv1);
32 int ret2=ioctl(fd, command,arg);
33 - int ret3=clock_gettime(d->private->clock,&tv2);
34 + int ret3=clock_gettime(d->private_data->clock,&tv2);
35 if(ret1<0 || ret3<0){
36 - d->private->last_milliseconds=-1;
37 + d->private_data->last_milliseconds=-1;
38 }else{
39 - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
40 + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
41 }
42 return ret2;
43 }
44 diff -urp cdparanoia-III-10.2.orig/interface/interface.c cdparanoia-III-10.2/interface/interface.c
45 --- cdparanoia-III-10.2.orig/interface/interface.c 2008-09-11 11:43:52.000000000 +0100
46 +++ cdparanoia-III-10.2/interface/interface.c 2008-09-25 00:19:47.000000000 +0100
47 @@ -39,9 +39,9 @@ int cdda_close(cdrom_drive *d){
48 if(d->drive_model)free(d->drive_model);
49 if(d->cdda_fd!=-1)close(d->cdda_fd);
50 if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
51 - if(d->private){
52 - if(d->private->sg_hd)free(d->private->sg_hd);
53 - free(d->private);
54 + if(d->private_data){
55 + if(d->private_data->sg_hd)free(d->private_data->sg_hd);
56 + free(d->private_data);
57 }
58
59 free(d);
60 @@ -127,7 +127,7 @@ long cdda_read_timed(cdrom_drive *d, voi
61 }
62 }
63 }
64 - if(ms)*ms=d->private->last_milliseconds;
65 + if(ms)*ms=d->private_data->last_milliseconds;
66 return(sectors);
67 }
68
69 diff -urp cdparanoia-III-10.2.orig/interface/scan_devices.c cdparanoia-III-10.2/interface/scan_devices.c
70 --- cdparanoia-III-10.2.orig/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100
71 +++ cdparanoia-III-10.2/interface/scan_devices.c 2008-09-25 00:20:35.000000000 +0100
72 @@ -264,11 +264,11 @@ cdrom_drive *cdda_identify_cooked(const
73 d->interface=COOKED_IOCTL;
74 d->bigendianp=-1; /* We don't know yet... */
75 d->nsectors=-1;
76 - d->private=calloc(1,sizeof(*d->private));
77 + d->private_data=calloc(1,sizeof(*d->private_data));
78 {
79 /* goddamnit */
80 struct timespec tv;
81 - d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
82 + d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
83 }
84 idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
85 return(d);
86 @@ -674,15 +674,15 @@ cdrom_drive *cdda_identify_scsi(const ch
87 d->bigendianp=-1; /* We don't know yet... */
88 d->nsectors=-1;
89 d->messagedest = messagedest;
90 - d->private=calloc(1,sizeof(*d->private));
91 + d->private_data=calloc(1,sizeof(*d->private_data));
92 {
93 /* goddamnit */
94 struct timespec tv;
95 - d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
96 + d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
97 }
98 if(use_sgio){
99 d->interface=SGIO_SCSI;
100 - d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
101 + d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
102 g_fd=d->cdda_fd=dup(d->ioctl_fd);
103 }else{
104 version=verify_SG_version(d,messagedest,messages);
105 @@ -696,8 +696,8 @@ cdrom_drive *cdda_identify_scsi(const ch
106 }
107
108 /* malloc our big buffer for scsi commands */
109 - d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
110 - d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
111 + d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
112 + d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
113 }
114
115 {
116 @@ -772,9 +772,9 @@ cdda_identify_scsi_fail:
117 if(i_fd!=-1)close(i_fd);
118 if(g_fd!=-1)close(g_fd);
119 if(d){
120 - if(d->private){
121 - if(d->private->sg_hd)free(d->private->sg_hd);
122 - free(d->private);
123 + if(d->private_data){
124 + if(d->private_data->sg_hd)free(d->private_data->sg_hd);
125 + free(d->private_data);
126 }
127 free(d);
128 }
129 @@ -821,7 +821,7 @@ cdrom_drive *cdda_identify_test(const ch
130 d->interface=TEST_INTERFACE;
131 d->bigendianp=-1; /* We don't know yet... */
132 d->nsectors=-1;
133 - d->private=calloc(1,sizeof(*d->private));
134 + d->private_data=calloc(1,sizeof(*d->private_data));
135 d->drive_model=copystring("File based test interface");
136 idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
137
138 diff -urp cdparanoia-III-10.2.orig/interface/scsi_interface.c cdparanoia-III-10.2/interface/scsi_interface.c
139 --- cdparanoia-III-10.2.orig/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100
140 +++ cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-25 00:22:40.000000000 +0100
141 @@ -15,13 +15,13 @@
142 static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
143 struct timespec tv1;
144 struct timespec tv2;
145 - int ret1=clock_gettime(d->private->clock,&tv1);
146 + int ret1=clock_gettime(d->private_data->clock,&tv1);
147 int ret2=ioctl(fd, command,arg);
148 - int ret3=clock_gettime(d->private->clock,&tv2);
149 + int ret3=clock_gettime(d->private_data->clock,&tv2);
150 if(ret1<0 || ret3<0){
151 - d->private->last_milliseconds=-1;
152 + d->private_data->last_milliseconds=-1;
153 }else{
154 - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
155 + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
156 }
157 return ret2;
158 }
159 @@ -96,7 +96,7 @@ static void tweak_SG_buffer(cdrom_drive
160 static void clear_garbage(cdrom_drive *d){
161 fd_set fdset;
162 struct timeval tv;
163 - struct sg_header *sg_hd=d->private->sg_hd;
164 + struct sg_header *sg_hd=d->private_data->sg_hd;
165 int flag=0;
166
167 /* clear out any possibly preexisting garbage */
168 @@ -185,7 +185,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri
169 struct timespec tv2;
170 int tret1,tret2;
171 int status = 0;
172 - struct sg_header *sg_hd=d->private->sg_hd;
173 + struct sg_header *sg_hd=d->private_data->sg_hd;
174 long writebytes=SG_OFF+cmd_len+in_size;
175
176 /* generic scsi device services */
177 @@ -195,7 +195,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri
178
179 memset(sg_hd,0,sizeof(sg_hd));
180 memset(sense_buffer,0,SG_MAX_SENSE);
181 - memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
182 + memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
183 sg_hd->twelve_byte = cmd_len == 12;
184 sg_hd->result = 0;
185 sg_hd->reply_len = SG_OFF + out_size;
186 @@ -209,7 +209,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri
187 tell if the command failed. Scared yet? */
188
189 if(bytecheck && out_size>in_size){
190 - memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
191 + memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
192 /* the size does not remove cmd_len due to the way the kernel
193 driver copies buffers */
194 writebytes+=(out_size-in_size);
195 @@ -243,7 +243,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri
196 }
197
198 sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
199 - tret1=clock_gettime(d->private->clock,&tv1);
200 + tret1=clock_gettime(d->private_data->clock,&tv1);
201 errno=0;
202 status = write(d->cdda_fd, sg_hd, writebytes );
203
204 @@ -289,7 +289,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri
205 }
206 }
207
208 - tret2=clock_gettime(d->private->clock,&tv2);
209 + tret2=clock_gettime(d->private_data->clock,&tv2);
210 errno=0;
211 status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
212 sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
213 @@ -313,7 +313,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri
214 if(bytecheck && in_size+cmd_len<out_size){
215 long i,flag=0;
216 for(i=in_size;i<out_size;i++)
217 - if(d->private->sg_buffer[i]!=bytefill){
218 + if(d->private_data->sg_buffer[i]!=bytefill){
219 flag=1;
220 break;
221 }
222 @@ -326,9 +326,9 @@ static int sg2_handle_scsi_cmd(cdrom_dri
223
224 errno=0;
225 if(tret1<0 || tret2<0){
226 - d->private->last_milliseconds=-1;
227 + d->private_data->last_milliseconds=-1;
228 }else{
229 - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
230 + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
231 }
232 return(0);
233 }
234 @@ -347,7 +347,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr
235
236 memset(&hdr,0,sizeof(hdr));
237 memset(sense,0,sizeof(sense));
238 - memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
239 + memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
240
241 hdr.cmdp = cmd;
242 hdr.cmd_len = cmd_len;
243 @@ -355,7 +355,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr
244 hdr.mx_sb_len = SG_MAX_SENSE;
245 hdr.timeout = 50000;
246 hdr.interface_id = 'S';
247 - hdr.dxferp = d->private->sg_buffer;
248 + hdr.dxferp = d->private_data->sg_buffer;
249 hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */
250
251 /* scary buffer fill hack */
252 @@ -400,7 +400,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr
253 if(bytecheck && in_size<out_size){
254 long i,flag=0;
255 for(i=in_size;i<out_size;i++)
256 - if(d->private->sg_buffer[i]!=bytefill){
257 + if(d->private_data->sg_buffer[i]!=bytefill){
258 flag=1;
259 break;
260 }
261 @@ -412,7 +412,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr
262 }
263
264 /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
265 - /* d->private->last_milliseconds = hdr.duration; */
266 + /* d->private_data->last_milliseconds = hdr.duration; */
267
268 errno = 0;
269 return 0;
270 @@ -445,9 +445,9 @@ static int test_unit_ready(cdrom_drive *
271
272 handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
273
274 - key = d->private->sg_buffer[2] & 0xf;
275 - ASC = d->private->sg_buffer[12];
276 - ASCQ = d->private->sg_buffer[13];
277 + key = d->private_data->sg_buffer[2] & 0xf;
278 + ASC = d->private_data->sg_buffer[12];
279 + ASCQ = d->private_data->sg_buffer[13];
280
281 if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
282 return 1;
283 @@ -492,7 +492,7 @@ static int mode_sense_atapi(cdrom_drive
284 if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
285
286 {
287 - unsigned char *b=d->private->sg_buffer;
288 + unsigned char *b=d->private_data->sg_buffer;
289 if(b[0])return(1); /* Handles only up to 256 bytes */
290 if(b[6])return(1); /* Handles only up to 256 bytes */
291
292 @@ -604,8 +604,8 @@ static int mode_select(cdrom_drive *d,in
293 static unsigned int get_orig_sectorsize(cdrom_drive *d){
294 if(mode_sense(d,12,0x01))return(-1);
295
296 - d->orgdens = d->private->sg_buffer[4];
297 - return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
298 + d->orgdens = d->private_data->sg_buffer[4];
299 + return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
300 }
301
302 /* switch CDROM scsi drives to given sector size */
303 @@ -664,8 +664,8 @@ static int scsi_read_toc (cdrom_drive *d
304 return(-4);
305 }
306
307 - first=d->private->sg_buffer[2];
308 - last=d->private->sg_buffer[3];
309 + first=d->private_data->sg_buffer[2];
310 + last=d->private_data->sg_buffer[3];
311 tracks=last-first+1;
312
313 if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
314 @@ -683,7 +683,7 @@ static int scsi_read_toc (cdrom_drive *d
315 return(-5);
316 }
317 {
318 - scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
319 + scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
320
321 d->disc_toc[i-first].bFlags=toc->bFlags;
322 d->disc_toc[i-first].bTrack=i;
323 @@ -704,7 +704,7 @@ static int scsi_read_toc (cdrom_drive *d
324 return(-2);
325 }
326 {
327 - scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
328 + scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
329
330 d->disc_toc[i-first].bFlags=toc->bFlags;
331 d->disc_toc[i-first].bTrack=0xAA;
332 @@ -738,7 +738,7 @@ static int scsi_read_toc2 (cdrom_drive *
333 }
334
335 /* copy to our structure and convert start sector */
336 - tracks = d->private->sg_buffer[1];
337 + tracks = d->private_data->sg_buffer[1];
338 if (tracks > MAXTRK) {
339 cderror(d,"003: CDROM reporting illegal number of tracks\n");
340 return(-3);
341 @@ -754,33 +754,33 @@ static int scsi_read_toc2 (cdrom_drive *
342 return(-5);
343 }
344
345 - d->disc_toc[i].bFlags = d->private->sg_buffer[10];
346 + d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
347 d->disc_toc[i].bTrack = i + 1;
348
349 d->disc_toc[i].dwStartSector= d->adjust_ssize *
350 - (((signed char)(d->private->sg_buffer[2])<<24) |
351 - (d->private->sg_buffer[3]<<16)|
352 - (d->private->sg_buffer[4]<<8)|
353 - (d->private->sg_buffer[5]));
354 + (((signed char)(d->private_data->sg_buffer[2])<<24) |
355 + (d->private_data->sg_buffer[3]<<16)|
356 + (d->private_data->sg_buffer[4]<<8)|
357 + (d->private_data->sg_buffer[5]));
358 }
359
360 d->disc_toc[i].bFlags = 0;
361 d->disc_toc[i].bTrack = i + 1;
362 - memcpy (&foo, d->private->sg_buffer+2, 4);
363 - memcpy (&bar, d->private->sg_buffer+6, 4);
364 + memcpy (&foo, d->private_data->sg_buffer+2, 4);
365 + memcpy (&bar, d->private_data->sg_buffer+6, 4);
366 d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
367 be32_to_cpu(bar));
368
369 d->disc_toc[i].dwStartSector= d->adjust_ssize *
370 - ((((signed char)(d->private->sg_buffer[2])<<24) |
371 - (d->private->sg_buffer[3]<<16)|
372 - (d->private->sg_buffer[4]<<8)|
373 - (d->private->sg_buffer[5]))+
374 + ((((signed char)(d->private_data->sg_buffer[2])<<24) |
375 + (d->private_data->sg_buffer[3]<<16)|
376 + (d->private_data->sg_buffer[4]<<8)|
377 + (d->private_data->sg_buffer[5]))+
378
379 - ((((signed char)(d->private->sg_buffer[6])<<24) |
380 - (d->private->sg_buffer[7]<<16)|
381 - (d->private->sg_buffer[8]<<8)|
382 - (d->private->sg_buffer[9]))));
383 + ((((signed char)(d->private_data->sg_buffer[6])<<24) |
384 + (d->private_data->sg_buffer[7]<<16)|
385 + (d->private_data->sg_buffer[8]<<8)|
386 + (d->private_data->sg_buffer[9]))));
387
388
389 d->cd_extra = FixupTOC(d,tracks+1);
390 @@ -817,7 +817,7 @@ static int i_read_28 (cdrom_drive *d, vo
391 cmd[8] = sectors;
392 if((ret=handle_scsi_cmd(d,cmd,10,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 @@ -836,7 +836,7 @@ static int i_read_A8 (cdrom_drive *d, vo
400 cmd[9] = 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 @@ -854,7 +854,7 @@ static int i_read_D4_10 (cdrom_drive *d,
409 cmd[8] = sectors;
410 if((ret=handle_scsi_cmd(d,cmd,10,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 @@ -872,7 +872,7 @@ static int i_read_D4_12 (cdrom_drive *d,
418 cmd[9] = sectors;
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 @@ -890,7 +890,7 @@ static int i_read_D5 (cdrom_drive *d, vo
427 cmd[8] = sectors;
428 if((ret=handle_scsi_cmd(d,cmd,10,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 @@ -908,7 +908,7 @@ static int i_read_D8 (cdrom_drive *d, vo
436 cmd[9] = sectors;
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 @@ -922,7 +922,7 @@ static int i_read_mmc (cdrom_drive *d, v
445 cmd[8] = sectors;
446 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
447 return(ret);
448 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
449 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
450 return(0);
451 }
452
453 @@ -936,7 +936,7 @@ static int i_read_mmcB (cdrom_drive *d,
454 cmd[8] = sectors;
455 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
456 return(ret);
457 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
458 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
459 return(0);
460 }
461
462 @@ -950,7 +950,7 @@ static int i_read_mmc2 (cdrom_drive *d,
463 cmd[8] = sectors;
464 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
465 return(ret);
466 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
467 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
468 return(0);
469 }
470
471 @@ -964,7 +964,7 @@ static int i_read_mmc2B (cdrom_drive *d,
472 cmd[8] = sectors;
473 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
474 return(ret);
475 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
476 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
477 return(0);
478 }
479
480 @@ -978,7 +978,7 @@ static int i_read_mmc3 (cdrom_drive *d,
481 cmd[8] = sectors;
482 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
483 return(ret);
484 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
485 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
486 return(0);
487 }
488
489 @@ -992,7 +992,7 @@ static int i_read_mmc3B (cdrom_drive *d,
490 cmd[8] = sectors;
491 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
492 return(ret);
493 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
494 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
495 return(0);
496 }
497
498 @@ -1026,7 +1026,7 @@ static int i_read_msf (cdrom_drive *d, v
499
500 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
501 return(ret);
502 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
503 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
504 return(0);
505 }
506
507 @@ -1039,7 +1039,7 @@ static int i_read_msf2 (cdrom_drive *d,
508
509 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
510 return(ret);
511 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
512 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
513 return(0);
514 }
515
516 @@ -1052,7 +1052,7 @@ static int i_read_msf3 (cdrom_drive *d,
517
518 if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
519 return(ret);
520 - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
521 + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
522 return(0);
523 }
524
525 @@ -1275,7 +1275,7 @@ long scsi_read_msf3 (cdrom_drive *d, voi
526 static int count_2352_bytes(cdrom_drive *d){
527 long i;
528 for(i=2351;i>=0;i--)
529 - if(d->private->sg_buffer[i]!=(unsigned char)'\177')
530 + if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
531 return(((i+3)>>2)<<2);
532
533 return(0);
534 @@ -1284,7 +1284,7 @@ static int count_2352_bytes(cdrom_drive
535 static int verify_nonzero(cdrom_drive *d){
536 long i,flag=0;
537 for(i=0;i<2352;i++)
538 - if(d->private->sg_buffer[i]!=0){
539 + if(d->private_data->sg_buffer[i]!=0){
540 flag=1;
541 break;
542 }
543 @@ -1625,7 +1625,7 @@ static int check_mmc(cdrom_drive *d){
544 d->is_mmc=0;
545 if(mode_sense(d,22,0x2A)==0){
546
547 - b=d->private->sg_buffer;
548 + b=d->private_data->sg_buffer;
549 b+=b[3]+4;
550
551 if((b[0]&0x3F)==0x2A){
552 @@ -1673,7 +1673,7 @@ unsigned char *scsi_inquiry(cdrom_drive
553 cderror(d,"008: Unable to identify CDROM model\n");
554 return(NULL);
555 }
556 - return (d->private->sg_buffer);
557 + return (d->private_data->sg_buffer);
558 }
559
560 int scsi_init_drive(cdrom_drive *d){
561 @@ -1742,8 +1742,8 @@ int scsi_init_drive(cdrom_drive *d){
562 check_cache(d);
563
564 d->error_retry=1;
565 - d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
566 - d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
567 + d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
568 + d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
569 d->report_all=1;
570 return(0);
571 }
572 diff -urp cdparanoia-III-10.2.orig/interface/test_interface.c cdparanoia-III-10.2/interface/test_interface.c
573 --- cdparanoia-III-10.2.orig/interface/test_interface.c 2008-09-11 21:33:30.000000000 +0100
574 +++ cdparanoia-III-10.2/interface/test_interface.c 2008-09-25 00:22:46.000000000 +0100
575 @@ -66,9 +66,9 @@ static long test_read(cdrom_drive *d, vo
576 if(!fd)fd=fdopen(d->cdda_fd,"r");
577
578 if(begin<lastread)
579 - d->private->last_milliseconds=20;
580 + d->private_data->last_milliseconds=20;
581 else
582 - d->private->last_milliseconds=sectors;
583 + d->private_data->last_milliseconds=sectors;
584
585 #ifdef CDDA_TEST_UNDERRUN
586 sectors-=1;