pyrox.dev / nixpkgs
lol
fork atom

cdparanoia: Fix private keyword in header

Patch taken from SVN, cdparanoia has not had a release since September
11, 2008. Allows including the header in C++ files.

https://trac.xiph.org/changeset/15338/

authored by

Fionn Cleary and committed by
Fionn Cleary 560891d3 0077c765

+470 -1
unified split
+2 -1
pkgs/applications/audio/cdparanoia/default.nix
··· 17 17 url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; 18 18 sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; 19 19 }) 20 - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch; 20 + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch 21 + ++ [./fix_private_keyword.patch]; 21 22 22 23 buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; 23 24
+468
pkgs/applications/audio/cdparanoia/fix_private_keyword.patch
··· 1 + --- cdparanoia-III-10.2/interface/cdda_interface.h (revision 15337) 2 + +++ cdparanoia-III-10.2/interface/cdda_interface.h (revision 15338) 3 + @@ -85,5 +85,5 @@ 4 + int is_mmc; 5 + 6 + - cdda_private_data_t *private; 7 + + cdda_private_data_t *private_data; 8 + void *reserved; 9 + unsigned char inqbytes[4]; 10 + --- cdparanoia-III-10.2/interface/cooked_interface.c (revision 15337) 11 + +++ cdparanoia-III-10.2/interface/cooked_interface.c (revision 15338) 12 + @@ -14,11 +14,11 @@ 13 + struct timespec tv1; 14 + struct timespec tv2; 15 + - int ret1=clock_gettime(d->private->clock,&tv1); 16 + + int ret1=clock_gettime(d->private_data->clock,&tv1); 17 + int ret2=ioctl(fd, command,arg); 18 + - int ret3=clock_gettime(d->private->clock,&tv2); 19 + + int ret3=clock_gettime(d->private_data->clock,&tv2); 20 + if(ret1<0 || ret3<0){ 21 + - d->private->last_milliseconds=-1; 22 + + d->private_data->last_milliseconds=-1; 23 + }else{ 24 + - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 25 + + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 26 + } 27 + return ret2; 28 + --- cdparanoia-III-10.2/interface/interface.c (revision 15337) 29 + +++ cdparanoia-III-10.2/interface/interface.c (revision 15338) 30 + @@ -40,7 +40,7 @@ 31 + if(d->cdda_fd!=-1)close(d->cdda_fd); 32 + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); 33 + - if(d->private){ 34 + - if(d->private->sg_hd)free(d->private->sg_hd); 35 + - free(d->private); 36 + + if(d->private_data){ 37 + + if(d->private_data->sg_hd)free(d->private_data->sg_hd); 38 + + free(d->private_data); 39 + } 40 + 41 + @@ -128,5 +128,5 @@ 42 + } 43 + } 44 + - if(ms)*ms=d->private->last_milliseconds; 45 + + if(ms)*ms=d->private_data->last_milliseconds; 46 + return(sectors); 47 + } 48 + --- cdparanoia-III-10.2/interface/scan_devices.c (revision 15337) 49 + +++ cdparanoia-III-10.2/interface/scan_devices.c (revision 15338) 50 + @@ -265,9 +265,9 @@ 51 + d->bigendianp=-1; /* We don't know yet... */ 52 + d->nsectors=-1; 53 + - d->private=calloc(1,sizeof(*d->private)); 54 + + d->private_data=calloc(1,sizeof(*d->private_data)); 55 + { 56 + /* goddamnit */ 57 + struct timespec tv; 58 + - d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 59 + + d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 60 + } 61 + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); 62 + @@ -675,13 +675,13 @@ 63 + d->nsectors=-1; 64 + d->messagedest = messagedest; 65 + - d->private=calloc(1,sizeof(*d->private)); 66 + + d->private_data=calloc(1,sizeof(*d->private_data)); 67 + { 68 + /* goddamnit */ 69 + struct timespec tv; 70 + - d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 71 + + d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 72 + } 73 + if(use_sgio){ 74 + d->interface=SGIO_SCSI; 75 + - d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); 76 + + d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); 77 + g_fd=d->cdda_fd=dup(d->ioctl_fd); 78 + }else{ 79 + @@ -697,6 +697,6 @@ 80 + 81 + /* malloc our big buffer for scsi commands */ 82 + - d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); 83 + - d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; 84 + + d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); 85 + + d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; 86 + } 87 + 88 + @@ -773,7 +773,7 @@ 89 + if(g_fd!=-1)close(g_fd); 90 + if(d){ 91 + - if(d->private){ 92 + - if(d->private->sg_hd)free(d->private->sg_hd); 93 + - free(d->private); 94 + + if(d->private_data){ 95 + + if(d->private_data->sg_hd)free(d->private_data->sg_hd); 96 + + free(d->private_data); 97 + } 98 + free(d); 99 + @@ -822,5 +822,5 @@ 100 + d->bigendianp=-1; /* We don't know yet... */ 101 + d->nsectors=-1; 102 + - d->private=calloc(1,sizeof(*d->private)); 103 + + d->private_data=calloc(1,sizeof(*d->private_data)); 104 + d->drive_model=copystring("File based test interface"); 105 + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); 106 + --- cdparanoia-III-10.2/interface/scsi_interface.c (revision 15337) 107 + +++ cdparanoia-III-10.2/interface/scsi_interface.c (revision 15338) 108 + @@ -16,11 +16,11 @@ 109 + struct timespec tv1; 110 + struct timespec tv2; 111 + - int ret1=clock_gettime(d->private->clock,&tv1); 112 + + int ret1=clock_gettime(d->private_data->clock,&tv1); 113 + int ret2=ioctl(fd, command,arg); 114 + - int ret3=clock_gettime(d->private->clock,&tv2); 115 + + int ret3=clock_gettime(d->private_data->clock,&tv2); 116 + if(ret1<0 || ret3<0){ 117 + - d->private->last_milliseconds=-1; 118 + + d->private_data->last_milliseconds=-1; 119 + }else{ 120 + - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 121 + + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 122 + } 123 + return ret2; 124 + @@ -97,5 +97,5 @@ 125 + fd_set fdset; 126 + struct timeval tv; 127 + - struct sg_header *sg_hd=d->private->sg_hd; 128 + + struct sg_header *sg_hd=d->private_data->sg_hd; 129 + int flag=0; 130 + 131 + @@ -186,5 +186,5 @@ 132 + int tret1,tret2; 133 + int status = 0; 134 + - struct sg_header *sg_hd=d->private->sg_hd; 135 + + struct sg_header *sg_hd=d->private_data->sg_hd; 136 + long writebytes=SG_OFF+cmd_len+in_size; 137 + 138 + @@ -196,5 +196,5 @@ 139 + memset(sg_hd,0,sizeof(sg_hd)); 140 + memset(sense_buffer,0,SG_MAX_SENSE); 141 + - memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); 142 + + memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); 143 + sg_hd->twelve_byte = cmd_len == 12; 144 + sg_hd->result = 0; 145 + @@ -210,5 +210,5 @@ 146 + 147 + if(bytecheck && out_size>in_size){ 148 + - memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 149 + + memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 150 + /* the size does not remove cmd_len due to the way the kernel 151 + driver copies buffers */ 152 + @@ -244,5 +244,5 @@ 153 + 154 + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); 155 + - tret1=clock_gettime(d->private->clock,&tv1); 156 + + tret1=clock_gettime(d->private_data->clock,&tv1); 157 + errno=0; 158 + status = write(d->cdda_fd, sg_hd, writebytes ); 159 + @@ -290,5 +290,5 @@ 160 + } 161 + 162 + - tret2=clock_gettime(d->private->clock,&tv2); 163 + + tret2=clock_gettime(d->private_data->clock,&tv2); 164 + errno=0; 165 + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); 166 + @@ -314,5 +314,5 @@ 167 + long i,flag=0; 168 + for(i=in_size;i<out_size;i++) 169 + - if(d->private->sg_buffer[i]!=bytefill){ 170 + + if(d->private_data->sg_buffer[i]!=bytefill){ 171 + flag=1; 172 + break; 173 + @@ -327,7 +327,7 @@ 174 + errno=0; 175 + if(tret1<0 || tret2<0){ 176 + - d->private->last_milliseconds=-1; 177 + + d->private_data->last_milliseconds=-1; 178 + }else{ 179 + - d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; 180 + + d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; 181 + } 182 + return(0); 183 + @@ -348,5 +348,5 @@ 184 + memset(&hdr,0,sizeof(hdr)); 185 + memset(sense,0,sizeof(sense)); 186 + - memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); 187 + + memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); 188 + 189 + hdr.cmdp = cmd; 190 + @@ -356,5 +356,5 @@ 191 + hdr.timeout = 50000; 192 + hdr.interface_id = 'S'; 193 + - hdr.dxferp = d->private->sg_buffer; 194 + + hdr.dxferp = d->private_data->sg_buffer; 195 + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ 196 + 197 + @@ -401,5 +401,5 @@ 198 + long i,flag=0; 199 + for(i=in_size;i<out_size;i++) 200 + - if(d->private->sg_buffer[i]!=bytefill){ 201 + + if(d->private_data->sg_buffer[i]!=bytefill){ 202 + flag=1; 203 + break; 204 + @@ -413,5 +413,5 @@ 205 + 206 + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ 207 + - /* d->private->last_milliseconds = hdr.duration; */ 208 + + /* d->private_data->last_milliseconds = hdr.duration; */ 209 + 210 + errno = 0; 211 + @@ -446,7 +446,7 @@ 212 + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); 213 + 214 + - key = d->private->sg_buffer[2] & 0xf; 215 + - ASC = d->private->sg_buffer[12]; 216 + - ASCQ = d->private->sg_buffer[13]; 217 + + key = d->private_data->sg_buffer[2] & 0xf; 218 + + ASC = d->private_data->sg_buffer[12]; 219 + + ASCQ = d->private_data->sg_buffer[13]; 220 + 221 + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; 222 + @@ -493,5 +493,5 @@ 223 + 224 + { 225 + - unsigned char *b=d->private->sg_buffer; 226 + + unsigned char *b=d->private_data->sg_buffer; 227 + if(b[0])return(1); /* Handles only up to 256 bytes */ 228 + if(b[6])return(1); /* Handles only up to 256 bytes */ 229 + @@ -605,6 +605,6 @@ 230 + if(mode_sense(d,12,0x01))return(-1); 231 + 232 + - d->orgdens = d->private->sg_buffer[4]; 233 + - return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); 234 + + d->orgdens = d->private_data->sg_buffer[4]; 235 + + return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); 236 + } 237 + 238 + @@ -665,6 +665,6 @@ 239 + } 240 + 241 + - first=d->private->sg_buffer[2]; 242 + - last=d->private->sg_buffer[3]; 243 + + first=d->private_data->sg_buffer[2]; 244 + + last=d->private_data->sg_buffer[3]; 245 + tracks=last-first+1; 246 + 247 + @@ -684,5 +684,5 @@ 248 + } 249 + { 250 + - scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); 251 + + scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); 252 + 253 + d->disc_toc[i-first].bFlags=toc->bFlags; 254 + @@ -705,5 +705,5 @@ 255 + } 256 + { 257 + - scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); 258 + + scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); 259 + 260 + d->disc_toc[i-first].bFlags=toc->bFlags; 261 + @@ -739,5 +739,5 @@ 262 + 263 + /* copy to our structure and convert start sector */ 264 + - tracks = d->private->sg_buffer[1]; 265 + + tracks = d->private_data->sg_buffer[1]; 266 + if (tracks > MAXTRK) { 267 + cderror(d,"003: CDROM reporting illegal number of tracks\n"); 268 + @@ -755,31 +755,31 @@ 269 + } 270 + 271 + - d->disc_toc[i].bFlags = d->private->sg_buffer[10]; 272 + + d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; 273 + d->disc_toc[i].bTrack = i + 1; 274 + 275 + d->disc_toc[i].dwStartSector= d->adjust_ssize * 276 + - (((signed char)(d->private->sg_buffer[2])<<24) | 277 + - (d->private->sg_buffer[3]<<16)| 278 + - (d->private->sg_buffer[4]<<8)| 279 + - (d->private->sg_buffer[5])); 280 + + (((signed char)(d->private_data->sg_buffer[2])<<24) | 281 + + (d->private_data->sg_buffer[3]<<16)| 282 + + (d->private_data->sg_buffer[4]<<8)| 283 + + (d->private_data->sg_buffer[5])); 284 + } 285 + 286 + d->disc_toc[i].bFlags = 0; 287 + d->disc_toc[i].bTrack = i + 1; 288 + - memcpy (&foo, d->private->sg_buffer+2, 4); 289 + - memcpy (&bar, d->private->sg_buffer+6, 4); 290 + + memcpy (&foo, d->private_data->sg_buffer+2, 4); 291 + + memcpy (&bar, d->private_data->sg_buffer+6, 4); 292 + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + 293 + be32_to_cpu(bar)); 294 + 295 + d->disc_toc[i].dwStartSector= d->adjust_ssize * 296 + - ((((signed char)(d->private->sg_buffer[2])<<24) | 297 + - (d->private->sg_buffer[3]<<16)| 298 + - (d->private->sg_buffer[4]<<8)| 299 + - (d->private->sg_buffer[5]))+ 300 + + ((((signed char)(d->private_data->sg_buffer[2])<<24) | 301 + + (d->private_data->sg_buffer[3]<<16)| 302 + + (d->private_data->sg_buffer[4]<<8)| 303 + + (d->private_data->sg_buffer[5]))+ 304 + 305 + - ((((signed char)(d->private->sg_buffer[6])<<24) | 306 + - (d->private->sg_buffer[7]<<16)| 307 + - (d->private->sg_buffer[8]<<8)| 308 + - (d->private->sg_buffer[9])))); 309 + + ((((signed char)(d->private_data->sg_buffer[6])<<24) | 310 + + (d->private_data->sg_buffer[7]<<16)| 311 + + (d->private_data->sg_buffer[8]<<8)| 312 + + (d->private_data->sg_buffer[9])))); 313 + 314 + 315 + @@ -818,5 +818,5 @@ 316 + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 317 + return(ret); 318 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 319 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 320 + return(0); 321 + } 322 + @@ -837,5 +837,5 @@ 323 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 324 + return(ret); 325 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 326 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 327 + return(0); 328 + } 329 + @@ -855,5 +855,5 @@ 330 + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 331 + return(ret); 332 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 333 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 334 + return(0); 335 + } 336 + @@ -873,5 +873,5 @@ 337 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 338 + return(ret); 339 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 340 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 341 + return(0); 342 + } 343 + @@ -891,5 +891,5 @@ 344 + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 345 + return(ret); 346 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 347 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 348 + return(0); 349 + } 350 + @@ -909,5 +909,5 @@ 351 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 352 + return(ret); 353 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 354 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 355 + return(0); 356 + } 357 + @@ -923,5 +923,5 @@ 358 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 359 + return(ret); 360 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 361 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 362 + return(0); 363 + } 364 + @@ -937,5 +937,5 @@ 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 + @@ -951,5 +951,5 @@ 372 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 373 + return(ret); 374 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 375 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 376 + return(0); 377 + } 378 + @@ -965,5 +965,5 @@ 379 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 380 + return(ret); 381 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 382 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 383 + return(0); 384 + } 385 + @@ -979,5 +979,5 @@ 386 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 387 + return(ret); 388 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 389 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 390 + return(0); 391 + } 392 + @@ -993,5 +993,5 @@ 393 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 394 + return(ret); 395 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 396 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 397 + return(0); 398 + } 399 + @@ -1027,5 +1027,5 @@ 400 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 401 + return(ret); 402 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 403 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 404 + return(0); 405 + } 406 + @@ -1040,5 +1040,5 @@ 407 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 408 + return(ret); 409 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 410 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 411 + return(0); 412 + } 413 + @@ -1053,5 +1053,5 @@ 414 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 415 + return(ret); 416 + - if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 417 + + if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 418 + return(0); 419 + } 420 + @@ -1276,5 +1276,5 @@ 421 + long i; 422 + for(i=2351;i>=0;i--) 423 + - if(d->private->sg_buffer[i]!=(unsigned char)'\177') 424 + + if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') 425 + return(((i+3)>>2)<<2); 426 + 427 + @@ -1285,5 +1285,5 @@ 428 + long i,flag=0; 429 + for(i=0;i<2352;i++) 430 + - if(d->private->sg_buffer[i]!=0){ 431 + + if(d->private_data->sg_buffer[i]!=0){ 432 + flag=1; 433 + break; 434 + @@ -1622,5 +1622,5 @@ 435 + if(mode_sense(d,22,0x2A)==0){ 436 + 437 + - b=d->private->sg_buffer; 438 + + b=d->private_data->sg_buffer; 439 + b+=b[3]+4; 440 + 441 + @@ -1670,5 +1670,5 @@ 442 + return(NULL); 443 + } 444 + - return (d->private->sg_buffer); 445 + + return (d->private_data->sg_buffer); 446 + } 447 + 448 + @@ -1726,6 +1726,6 @@ 449 + 450 + d->error_retry=1; 451 + - d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); 452 + - d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; 453 + + d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); 454 + + d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; 455 + d->report_all=1; 456 + return(0); 457 + --- cdparanoia-III-10.2/interface/test_interface.c (revision 15337) 458 + +++ cdparanoia-III-10.2/interface/test_interface.c (revision 15338) 459 + @@ -67,7 +67,7 @@ 460 + 461 + if(begin<lastread) 462 + - d->private->last_milliseconds=20; 463 + + d->private_data->last_milliseconds=20; 464 + else 465 + - d->private->last_milliseconds=sectors; 466 + + d->private_data->last_milliseconds=sectors; 467 + 468 + #ifdef CDDA_TEST_UNDERRUN