libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now unconditional: Cdrskin_libburn_has_drive_get_adR

Browse Source
This commit is contained in:
Thomas Schmitt 2011-10-06 11:28:31 +00:00
parent 15192c2bfa
commit f986fe83ff
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cdrskin/cdrskin.c
View File

@ -174,7 +174,7 @@ or
/* 0.2.2 */ /* 0.2.2 */
#define Cdrskin_libburn_does_ejecT 1 #define Cdrskin_libburn_does_ejecT 1
#define Cdrskin_libburn_has_drive_get_adR 1 /* Cdrskin_libburn_has_drive_get_adR */
/* Cdrskin_progress_track_does_worK */ /* Cdrskin_progress_track_does_worK */
/* Cdrskin_is_erasable_on_load_does_worK */ /* Cdrskin_is_erasable_on_load_does_worK */
/* Cdrskin_grab_abort_does_worK */ /* Cdrskin_grab_abort_does_worK */
@ -4035,16 +4035,9 @@ int Cdrskin_driveno_of_location(struct CdrskiN *skin, char *devicename,
char adr[Cdrskin_adrleN]; char adr[Cdrskin_adrleN];
for(i= 0; i < (int) skin->n_drives; i++) { for(i= 0; i < (int) skin->n_drives; i++) {
#ifdef Cdrskin_libburn_has_drive_get_adR
ret= burn_drive_get_adr(&(skin->drives[i]), adr); ret= burn_drive_get_adr(&(skin->drives[i]), adr);
if(ret<=0) if(ret<=0)
continue; continue;
#else
ret= 1; /* to please gcc -Wall */
strcpy(adr,skin->drives[i].location);
#endif
if(strcmp(adr,devicename)==0) { if(strcmp(adr,devicename)==0) {
*driveno= i; *driveno= i;
return(1); return(1);
@ -4153,18 +4146,10 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
if(driveno < 0 || driveno > (int) skin->n_drives) if(driveno < 0 || driveno > (int) skin->n_drives)
goto fallback; goto fallback;
#ifdef Cdrskin_libburn_has_drive_get_adR
ret= burn_drive_get_adr(&(skin->drives[driveno]), adr); ret= burn_drive_get_adr(&(skin->drives[driveno]), adr);
if(ret<=0) if(ret<=0)
goto fallback; goto fallback;
loc= adr; loc= adr;
#else
adr[0]= 0; /* to please gcc -Wall */
loc= skin->drives[driveno].location;
if(loc==NULL)
goto fallback;
#endif
ret= burn_drive_get_drive_role(skin->drives[driveno].drive); ret= burn_drive_get_drive_role(skin->drives[driveno].drive);
if(ret!=1) { if(ret!=1) {
sprintf(btldev,"stdio:%s",adr); sprintf(btldev,"stdio:%s",adr);
@ -4428,17 +4413,11 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
skin->n_drives); skin->n_drives);
printf("-----------------------------------------------------------------------------\n"); printf("-----------------------------------------------------------------------------\n");
for(i= 0; i < (int) skin->n_drives; i++) { for(i= 0; i < (int) skin->n_drives; i++) {
#ifdef Cdrskin_libburn_has_drive_get_adR
ret= burn_drive_get_adr(&(skin->drives[i]), adr); ret= burn_drive_get_adr(&(skin->drives[i]), adr);
if(ret<=0) { if(ret<=0) {
/* >>> one should massively complain */; /* >>> one should massively complain */;
continue; continue;
} }
#else
strcpy(adr,skin->drives[i].location);
#endif
if(stat(adr,&stbuf)==-1) { if(stat(adr,&stbuf)==-1) {
sprintf(perms,"errno=%d",errno); sprintf(perms,"errno=%d",errno);
} else { } else {
@ -7004,15 +6983,9 @@ sorry_failed_to_eject:;
Cdrpreskin_consider_normal_user(0); Cdrpreskin_consider_normal_user(0);
return(0); return(0);
} }
#ifdef Cdrskin_libburn_has_drive_get_adR
ret= burn_drive_get_adr(&(skin->drives[skin->driveno]), adr); ret= burn_drive_get_adr(&(skin->drives[skin->driveno]), adr);
if(ret<=0) if(ret<=0)
adr[0]= 0; adr[0]= 0;
#else
strcpy(adr,skin->drives[skin->driveno].location);
#endif
if(strlen(skin->eject_device)>0) if(strlen(skin->eject_device)>0)
sprintf(cmd,"eject %s",Text_shellsafe(skin->eject_device,shellsafe,0)); sprintf(cmd,"eject %s",Text_shellsafe(skin->eject_device,shellsafe,0));
else if(strcmp(adr,"/dev/sg0")==0) else if(strcmp(adr,"/dev/sg0")==0)
@ -8002,15 +7975,9 @@ ignore_unknown:;
if(ret<=0) if(ret<=0)
return(ret); return(ret);
if(skin->verbosity>=Cdrskin_verbose_cmD) { if(skin->verbosity>=Cdrskin_verbose_cmD) {
#ifdef Cdrskin_libburn_has_drive_get_adR
ret= burn_drive_get_adr(&(skin->drives[skin->driveno]), adr); ret= burn_drive_get_adr(&(skin->drives[skin->driveno]), adr);
if(ret<=0) if(ret<=0)
adr[0]= 0; adr[0]= 0;
#else
strcpy(adr,skin->drives[skin->driveno].location);
#endif
printf("cdrskin: active drive number : %d '%s'\n", printf("cdrskin: active drive number : %d '%s'\n",
skin->driveno,adr); skin->driveno,adr);
} }

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.10.06.112456" #define Cdrskin_timestamP "2011.10.06.112732"