cdparanoia/cdparanoia-10.2-gcc43.patch

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