Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 180381 Details for
Bug 257047
sys-devel/gcc-4.3.3 + old glibc causes media-sound/cdparanoia-3.10.2-r2 compile failure
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gcc 4.3 patch file
cdparanoia-3.10.2-gcc43.patch (text/plain), 22.53 KB, created by
Karl H
on 2009-01-31 08:12:20 UTC
(
hide
)
Description:
gcc 4.3 patch file
Filename:
MIME Type:
Creator:
Karl H
Created:
2009-01-31 08:12:20 UTC
Size:
22.53 KB
patch
obsolete
>diff -urp cdparanoia-III-10.2.orig/interface/cdda_interface.h cdparanoia-III-10.2/interface/cdda_interface.h >--- cdparanoia-III-10.2.orig/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100 >+++ cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-25 00:18:02.000000000 +0100 >@@ -84,7 +84,7 @@ typedef struct cdrom_drive{ > int is_atapi; > int is_mmc; > >- cdda_private_data_t *private; >+ cdda_private_data_t *private_data; > void *reserved; > unsigned char inqbytes[4]; > >diff -urp cdparanoia-III-10.2.orig/interface/cooked_interface.c cdparanoia-III-10.2/interface/cooked_interface.c >--- cdparanoia-III-10.2.orig/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100 >+++ cdparanoia-III-10.2/interface/cooked_interface.c 2008-09-25 00:19:21.000000000 +0100 >@@ -13,13 +13,13 @@ > static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ > struct timespec tv1; > struct timespec tv2; >- int ret1=clock_gettime(d->private->clock,&tv1); >+ int ret1=clock_gettime(d->private_data->clock,&tv1); > int ret2=ioctl(fd, command,arg); >- int ret3=clock_gettime(d->private->clock,&tv2); >+ int ret3=clock_gettime(d->private_data->clock,&tv2); > if(ret1<0 || ret3<0){ >- d->private->last_milliseconds=-1; >+ d->private_data->last_milliseconds=-1; > }else{ >- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; >+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; > } > return ret2; > } >diff -urp cdparanoia-III-10.2.orig/interface/interface.c cdparanoia-III-10.2/interface/interface.c >--- cdparanoia-III-10.2.orig/interface/interface.c 2008-09-11 11:43:52.000000000 +0100 >+++ cdparanoia-III-10.2/interface/interface.c 2008-09-25 00:19:47.000000000 +0100 >@@ -39,9 +39,9 @@ int cdda_close(cdrom_drive *d){ > if(d->drive_model)free(d->drive_model); > if(d->cdda_fd!=-1)close(d->cdda_fd); > if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); >- if(d->private){ >- if(d->private->sg_hd)free(d->private->sg_hd); >- free(d->private); >+ if(d->private_data){ >+ if(d->private_data->sg_hd)free(d->private_data->sg_hd); >+ free(d->private_data); > } > > free(d); >@@ -127,7 +127,7 @@ long cdda_read_timed(cdrom_drive *d, voi > } > } > } >- if(ms)*ms=d->private->last_milliseconds; >+ if(ms)*ms=d->private_data->last_milliseconds; > return(sectors); > } > >diff -urp cdparanoia-III-10.2.orig/interface/scan_devices.c cdparanoia-III-10.2/interface/scan_devices.c >--- cdparanoia-III-10.2.orig/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100 >+++ cdparanoia-III-10.2/interface/scan_devices.c 2008-09-25 00:20:35.000000000 +0100 >@@ -264,11 +264,11 @@ cdrom_drive *cdda_identify_cooked(const > d->interface=COOKED_IOCTL; > d->bigendianp=-1; /* We don't know yet... */ > d->nsectors=-1; >- d->private=calloc(1,sizeof(*d->private)); >+ d->private_data=calloc(1,sizeof(*d->private_data)); > { > /* goddamnit */ > struct timespec tv; >- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); >+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); > } > idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); > return(d); >@@ -674,15 +674,15 @@ cdrom_drive *cdda_identify_scsi(const ch > d->bigendianp=-1; /* We don't know yet... */ > d->nsectors=-1; > d->messagedest = messagedest; >- d->private=calloc(1,sizeof(*d->private)); >+ d->private_data=calloc(1,sizeof(*d->private_data)); > { > /* goddamnit */ > struct timespec tv; >- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); >+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); > } > if(use_sgio){ > d->interface=SGIO_SCSI; >- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); >+ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); > g_fd=d->cdda_fd=dup(d->ioctl_fd); > }else{ > version=verify_SG_version(d,messagedest,messages); >@@ -696,8 +696,8 @@ cdrom_drive *cdda_identify_scsi(const ch > } > > /* malloc our big buffer for scsi commands */ >- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); >- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; >+ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); >+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; > } > > { >@@ -772,9 +772,9 @@ cdda_identify_scsi_fail: > if(i_fd!=-1)close(i_fd); > if(g_fd!=-1)close(g_fd); > if(d){ >- if(d->private){ >- if(d->private->sg_hd)free(d->private->sg_hd); >- free(d->private); >+ if(d->private_data){ >+ if(d->private_data->sg_hd)free(d->private_data->sg_hd); >+ free(d->private_data); > } > free(d); > } >@@ -821,7 +821,7 @@ cdrom_drive *cdda_identify_test(const ch > d->interface=TEST_INTERFACE; > d->bigendianp=-1; /* We don't know yet... */ > d->nsectors=-1; >- d->private=calloc(1,sizeof(*d->private)); >+ d->private_data=calloc(1,sizeof(*d->private_data)); > d->drive_model=copystring("File based test interface"); > idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); > >diff -urp cdparanoia-III-10.2.orig/interface/scsi_interface.c cdparanoia-III-10.2/interface/scsi_interface.c >--- cdparanoia-III-10.2.orig/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100 >+++ cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-25 00:22:40.000000000 +0100 >@@ -15,13 +15,13 @@ > static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ > struct timespec tv1; > struct timespec tv2; >- int ret1=clock_gettime(d->private->clock,&tv1); >+ int ret1=clock_gettime(d->private_data->clock,&tv1); > int ret2=ioctl(fd, command,arg); >- int ret3=clock_gettime(d->private->clock,&tv2); >+ int ret3=clock_gettime(d->private_data->clock,&tv2); > if(ret1<0 || ret3<0){ >- d->private->last_milliseconds=-1; >+ d->private_data->last_milliseconds=-1; > }else{ >- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; >+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; > } > return ret2; > } >@@ -96,7 +96,7 @@ static void tweak_SG_buffer(cdrom_drive > static void clear_garbage(cdrom_drive *d){ > fd_set fdset; > struct timeval tv; >- struct sg_header *sg_hd=d->private->sg_hd; >+ struct sg_header *sg_hd=d->private_data->sg_hd; > int flag=0; > > /* clear out any possibly preexisting garbage */ >@@ -185,7 +185,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri > struct timespec tv2; > int tret1,tret2; > int status = 0; >- struct sg_header *sg_hd=d->private->sg_hd; >+ struct sg_header *sg_hd=d->private_data->sg_hd; > long writebytes=SG_OFF+cmd_len+in_size; > > /* generic scsi device services */ >@@ -195,7 +195,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri > > memset(sg_hd,0,sizeof(sg_hd)); > memset(sense_buffer,0,SG_MAX_SENSE); >- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); >+ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); > sg_hd->twelve_byte = cmd_len == 12; > sg_hd->result = 0; > sg_hd->reply_len = SG_OFF + out_size; >@@ -209,7 +209,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri > tell if the command failed. Scared yet? */ > > if(bytecheck && out_size>in_size){ >- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); >+ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); > /* the size does not remove cmd_len due to the way the kernel > driver copies buffers */ > writebytes+=(out_size-in_size); >@@ -243,7 +243,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri > } > > sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); >- tret1=clock_gettime(d->private->clock,&tv1); >+ tret1=clock_gettime(d->private_data->clock,&tv1); > errno=0; > status = write(d->cdda_fd, sg_hd, writebytes ); > >@@ -289,7 +289,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri > } > } > >- tret2=clock_gettime(d->private->clock,&tv2); >+ tret2=clock_gettime(d->private_data->clock,&tv2); > errno=0; > status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); > sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); >@@ -313,7 +313,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri > if(bytecheck && in_size+cmd_len<out_size){ > long i,flag=0; > for(i=in_size;i<out_size;i++) >- if(d->private->sg_buffer[i]!=bytefill){ >+ if(d->private_data->sg_buffer[i]!=bytefill){ > flag=1; > break; > } >@@ -326,9 +326,9 @@ static int sg2_handle_scsi_cmd(cdrom_dri > > errno=0; > if(tret1<0 || tret2<0){ >- d->private->last_milliseconds=-1; >+ d->private_data->last_milliseconds=-1; > }else{ >- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; >+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; > } > return(0); > } >@@ -347,7 +347,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr > > memset(&hdr,0,sizeof(hdr)); > memset(sense,0,sizeof(sense)); >- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); >+ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); > > hdr.cmdp = cmd; > hdr.cmd_len = cmd_len; >@@ -355,7 +355,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr > hdr.mx_sb_len = SG_MAX_SENSE; > hdr.timeout = 50000; > hdr.interface_id = 'S'; >- hdr.dxferp = d->private->sg_buffer; >+ hdr.dxferp = d->private_data->sg_buffer; > hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ > > /* scary buffer fill hack */ >@@ -400,7 +400,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr > if(bytecheck && in_size<out_size){ > long i,flag=0; > for(i=in_size;i<out_size;i++) >- if(d->private->sg_buffer[i]!=bytefill){ >+ if(d->private_data->sg_buffer[i]!=bytefill){ > flag=1; > break; > } >@@ -412,7 +412,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr > } > > /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ >- /* d->private->last_milliseconds = hdr.duration; */ >+ /* d->private_data->last_milliseconds = hdr.duration; */ > > errno = 0; > return 0; >@@ -445,9 +445,9 @@ static int test_unit_ready(cdrom_drive * > > handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); > >- key = d->private->sg_buffer[2] & 0xf; >- ASC = d->private->sg_buffer[12]; >- ASCQ = d->private->sg_buffer[13]; >+ key = d->private_data->sg_buffer[2] & 0xf; >+ ASC = d->private_data->sg_buffer[12]; >+ ASCQ = d->private_data->sg_buffer[13]; > > if(key == 2 && ASC == 4 && ASCQ == 1) return 0; > return 1; >@@ -492,7 +492,7 @@ static int mode_sense_atapi(cdrom_drive > if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); > > { >- unsigned char *b=d->private->sg_buffer; >+ unsigned char *b=d->private_data->sg_buffer; > if(b[0])return(1); /* Handles only up to 256 bytes */ > if(b[6])return(1); /* Handles only up to 256 bytes */ > >@@ -604,8 +604,8 @@ static int mode_select(cdrom_drive *d,in > static unsigned int get_orig_sectorsize(cdrom_drive *d){ > if(mode_sense(d,12,0x01))return(-1); > >- d->orgdens = d->private->sg_buffer[4]; >- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); >+ d->orgdens = d->private_data->sg_buffer[4]; >+ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); > } > > /* switch CDROM scsi drives to given sector size */ >@@ -664,8 +664,8 @@ static int scsi_read_toc (cdrom_drive *d > return(-4); > } > >- first=d->private->sg_buffer[2]; >- last=d->private->sg_buffer[3]; >+ first=d->private_data->sg_buffer[2]; >+ last=d->private_data->sg_buffer[3]; > tracks=last-first+1; > > if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { >@@ -683,7 +683,7 @@ static int scsi_read_toc (cdrom_drive *d > return(-5); > } > { >- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); >+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); > > d->disc_toc[i-first].bFlags=toc->bFlags; > d->disc_toc[i-first].bTrack=i; >@@ -704,7 +704,7 @@ static int scsi_read_toc (cdrom_drive *d > return(-2); > } > { >- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); >+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); > > d->disc_toc[i-first].bFlags=toc->bFlags; > d->disc_toc[i-first].bTrack=0xAA; >@@ -738,7 +738,7 @@ static int scsi_read_toc2 (cdrom_drive * > } > > /* copy to our structure and convert start sector */ >- tracks = d->private->sg_buffer[1]; >+ tracks = d->private_data->sg_buffer[1]; > if (tracks > MAXTRK) { > cderror(d,"003: CDROM reporting illegal number of tracks\n"); > return(-3); >@@ -754,33 +754,33 @@ static int scsi_read_toc2 (cdrom_drive * > return(-5); > } > >- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; >+ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; > d->disc_toc[i].bTrack = i + 1; > > d->disc_toc[i].dwStartSector= d->adjust_ssize * >- (((signed char)(d->private->sg_buffer[2])<<24) | >- (d->private->sg_buffer[3]<<16)| >- (d->private->sg_buffer[4]<<8)| >- (d->private->sg_buffer[5])); >+ (((signed char)(d->private_data->sg_buffer[2])<<24) | >+ (d->private_data->sg_buffer[3]<<16)| >+ (d->private_data->sg_buffer[4]<<8)| >+ (d->private_data->sg_buffer[5])); > } > > d->disc_toc[i].bFlags = 0; > d->disc_toc[i].bTrack = i + 1; >- memcpy (&foo, d->private->sg_buffer+2, 4); >- memcpy (&bar, d->private->sg_buffer+6, 4); >+ memcpy (&foo, d->private_data->sg_buffer+2, 4); >+ memcpy (&bar, d->private_data->sg_buffer+6, 4); > d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + > be32_to_cpu(bar)); > > d->disc_toc[i].dwStartSector= d->adjust_ssize * >- ((((signed char)(d->private->sg_buffer[2])<<24) | >- (d->private->sg_buffer[3]<<16)| >- (d->private->sg_buffer[4]<<8)| >- (d->private->sg_buffer[5]))+ >+ ((((signed char)(d->private_data->sg_buffer[2])<<24) | >+ (d->private_data->sg_buffer[3]<<16)| >+ (d->private_data->sg_buffer[4]<<8)| >+ (d->private_data->sg_buffer[5]))+ > >- ((((signed char)(d->private->sg_buffer[6])<<24) | >- (d->private->sg_buffer[7]<<16)| >- (d->private->sg_buffer[8]<<8)| >- (d->private->sg_buffer[9])))); >+ ((((signed char)(d->private_data->sg_buffer[6])<<24) | >+ (d->private_data->sg_buffer[7]<<16)| >+ (d->private_data->sg_buffer[8]<<8)| >+ (d->private_data->sg_buffer[9])))); > > > d->cd_extra = FixupTOC(d,tracks+1); >@@ -817,7 +817,7 @@ static int i_read_28 (cdrom_drive *d, vo > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -836,7 +836,7 @@ static int i_read_A8 (cdrom_drive *d, vo > cmd[9] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -854,7 +854,7 @@ static int i_read_D4_10 (cdrom_drive *d, > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -872,7 +872,7 @@ static int i_read_D4_12 (cdrom_drive *d, > cmd[9] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -890,7 +890,7 @@ static int i_read_D5 (cdrom_drive *d, vo > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -908,7 +908,7 @@ static int i_read_D8 (cdrom_drive *d, vo > cmd[9] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -922,7 +922,7 @@ static int i_read_mmc (cdrom_drive *d, v > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -936,7 +936,7 @@ static int i_read_mmcB (cdrom_drive *d, > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -950,7 +950,7 @@ static int i_read_mmc2 (cdrom_drive *d, > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -964,7 +964,7 @@ static int i_read_mmc2B (cdrom_drive *d, > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -978,7 +978,7 @@ static int i_read_mmc3 (cdrom_drive *d, > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -992,7 +992,7 @@ static int i_read_mmc3B (cdrom_drive *d, > cmd[8] = sectors; > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -1026,7 +1026,7 @@ static int i_read_msf (cdrom_drive *d, v > > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -1039,7 +1039,7 @@ static int i_read_msf2 (cdrom_drive *d, > > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -1052,7 +1052,7 @@ static int i_read_msf3 (cdrom_drive *d, > > if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) > return(ret); >- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); >+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); > return(0); > } > >@@ -1275,7 +1275,7 @@ long scsi_read_msf3 (cdrom_drive *d, voi > static int count_2352_bytes(cdrom_drive *d){ > long i; > for(i=2351;i>=0;i--) >- if(d->private->sg_buffer[i]!=(unsigned char)'\177') >+ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') > return(((i+3)>>2)<<2); > > return(0); >@@ -1284,7 +1284,7 @@ static int count_2352_bytes(cdrom_drive > static int verify_nonzero(cdrom_drive *d){ > long i,flag=0; > for(i=0;i<2352;i++) >- if(d->private->sg_buffer[i]!=0){ >+ if(d->private_data->sg_buffer[i]!=0){ > flag=1; > break; > } >@@ -1625,7 +1625,7 @@ static int check_mmc(cdrom_drive *d){ > d->is_mmc=0; > if(mode_sense(d,22,0x2A)==0){ > >- b=d->private->sg_buffer; >+ b=d->private_data->sg_buffer; > b+=b[3]+4; > > if((b[0]&0x3F)==0x2A){ >@@ -1673,7 +1673,7 @@ unsigned char *scsi_inquiry(cdrom_drive > cderror(d,"008: Unable to identify CDROM model\n"); > return(NULL); > } >- return (d->private->sg_buffer); >+ return (d->private_data->sg_buffer); > } > > int scsi_init_drive(cdrom_drive *d){ >@@ -1742,8 +1742,8 @@ int scsi_init_drive(cdrom_drive *d){ > check_cache(d); > > d->error_retry=1; >- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); >- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; >+ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); >+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; > d->report_all=1; > return(0); > } >diff -urp cdparanoia-III-10.2.orig/interface/test_interface.c cdparanoia-III-10.2/interface/test_interface.c >--- cdparanoia-III-10.2.orig/interface/test_interface.c 2008-09-11 21:33:30.000000000 +0100 >+++ cdparanoia-III-10.2/interface/test_interface.c 2008-09-25 00:22:46.000000000 +0100 >@@ -66,9 +66,9 @@ static long test_read(cdrom_drive *d, vo > if(!fd)fd=fdopen(d->cdda_fd,"r"); > > if(begin<lastread) >- d->private->last_milliseconds=20; >+ d->private_data->last_milliseconds=20; > else >- d->private->last_milliseconds=sectors; >+ d->private_data->last_milliseconds=sectors; > > #ifdef CDDA_TEST_UNDERRUN > sectors-=1; >--- cdparanoia-III-10.2.orig/interface/scsi_interface.c 2008-09-11 22:33:30.000000000 +0200 >+++ cdparanoia-III-10.2/interface/scsi_interface.c 2009-01-31 08:50:30.000000000 +0100 >@@ -656,6 +656,7 @@ static int scsi_read_toc (cdrom_drive *d > > /* read the header first */ > unsigned char sense[SG_MAX_SENSE]; >+ const unsigned char orig_cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0}; > unsigned char cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0}; > cmd[1]=d->lun<<5; > >@@ -674,7 +675,7 @@ static int scsi_read_toc (cdrom_drive *d > } > > for (i = first; i <= last; i++){ >- memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10); >+ memcpy(cmd, orig_cmd, 10); > cmd[1]=d->lun<<5; > cmd[6]=i; > >@@ -695,7 +696,7 @@ static int scsi_read_toc (cdrom_drive *d > } > } > >- memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10); >+ memcpy(cmd, orig_cmd, 10); > cmd[1]=d->lun<<5; > cmd[6]=0xAA; > >@@ -745,7 +746,8 @@ static int scsi_read_toc2 (cdrom_drive * > } > > for (i = 0; i < tracks; i++){ >- memcpy(cmd, (char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10); >+ memset(cmd, 0, 10); >+ cmd[0]=0xe5; > cmd[5]=i+1; > cmd[8]=255; >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=180381">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 257047
:
180376
|
180378
|
180379
| 180381
