ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make CDROM_GetLabel return 0 in the event of failure, and make the 

default label for drives a string of 11 spaces.
This commit is contained in:
Ryan Cumming 2001-01-09 20:54:11 +00:00 committed by Alexandre Julliard
parent 8767ee3e24
commit 418e27ea68
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/drive.c
View File

@ -189,7 +189,7 @@ int DRIVE_Init(void)
drive->ino = drive_stat_buffer.st_ino; drive->ino = drive_stat_buffer.st_ino;
/* Get the drive label */ /* Get the drive label */
PROFILE_GetWineIniString( name, "Label", name, drive->label_conf, 12 ); PROFILE_GetWineIniString( name, "Label", "", drive->label_conf, 12 );
if ((len = strlen(drive->label_conf)) < 11) if ((len = strlen(drive->label_conf)) < 11)
{ {
/* Pad label with spaces */ /* Pad label with spaces */

12
misc/cdrom.c
View File

@ -779,8 +779,6 @@ end:
return serial; return serial;
} }
static const char empty_label[] = " ";
/************************************************************************** /**************************************************************************
* CDROM_Data_GetLabel [internal] * CDROM_Data_GetLabel [internal]
*/ */
@ -822,13 +820,12 @@ DWORD CDROM_Data_GetLabel(WINE_CDAUDIO* wcda, char *label, int parentdev)
strncpy(label, (LPSTR)label_read, 11); strncpy(label, (LPSTR)label_read, 11);
label[11] = '\0'; label[11] = '\0';
} }
return 0; return 1;
} }
} }
failure: failure:
CDROM_CLOSE( dev, parentdev ); CDROM_CLOSE( dev, parentdev );
ERR("error reading label !\n"); ERR("error reading label !\n");
strcpy(label, empty_label);
return 0; return 0;
} }
@ -866,22 +863,23 @@ DWORD CDROM_GetLabel(int drive, char *label)
/* common code *here* !! */ /* common code *here* !! */
/* hopefully a data CD */ /* hopefully a data CD */
CDROM_Data_GetLabel(&wcda, label, dev); if (!CDROM_Data_GetLabel(&wcda, label, dev))
ret = 0;
break; break;
case CDS_MIXED: case CDS_MIXED:
cdname = "Mixed mode"; cdname = "Mixed mode";
ERR("We don't have a way of determining the label of a mixed mode CD - Linux doesn't allow raw access !!\n"); ERR("We don't have a way of determining the label of a mixed mode CD - Linux doesn't allow raw access !!\n");
/* fall through */ /* fall through */
case CDS_NO_INFO: case CDS_NO_INFO:
if (!cdname) cdname = "No_info"; if (!cdname) cdname = "No_info";
strcpy(label, empty_label); ret = 0;
break; break;
default: default:
WARN("Strange CD type (%d) or empty ?\n", media); WARN("Strange CD type (%d) or empty ?\n", media);
cdname = "Strange/empty"; cdname = "Strange/empty";
strcpy(label, empty_label);
ret = 0; ret = 0;
break; break;
} }