Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Volume:Mount(): Better failure output

Browse Source 
Also use the FATAL() instead of the ERROR() macro, so something is
printed also with debugging disabled.
This commit is contained in:
Ingo Weinhold 2011-06-26 03:20:58 +02:00
parent c99aa60b78
commit 2a5bef01a3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/file_systems/packagefs/Volume.cpp
View File

@ -492,19 +492,21 @@ Volume::Mount(const char* parameterString)
&delete_driver_settings); &delete_driver_settings);
if (packages == NULL || packages[0] == '\0') { if (packages == NULL || packages[0] == '\0') {
ERROR("need package folder ('packages' parameter)!\n"); FATAL("need package folder ('packages' parameter)!\n");
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
} }
error = _InitMountType(mountType); error = _InitMountType(mountType);
if (error != B_OK) { if (error != B_OK) {
ERROR("invalid mount type: \"%s\"\n", mountType); FATAL("invalid mount type: \"%s\"\n", mountType);
RETURN_ERROR(B_ERROR); RETURN_ERROR(error);
} }
struct stat st; struct stat st;
if (stat(packages, &st) < 0) if (stat(packages, &st) < 0) {
FATAL("failed to stat: \"%s\": %s\n", packages, strerror(errno));
RETURN_ERROR(B_ERROR); RETURN_ERROR(B_ERROR);
}
// If no volume name is given, infer it from the mount type. // If no volume name is given, infer it from the mount type.
if (volumeName == NULL) { if (volumeName == NULL) {