[haiku-commits] haiku: hrev48430 - src/bin/makebootable/platform/bios_ia32 src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/private headers/private/userlandfs/private
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 3 Dec 2014 21:15:15 +0100 (CET)
hrev48430 adds 2 changesets to branch 'master'
old head: bf4b97c6949187440bf3e925c66514ac3f65b251
new head: 249a4944c397b19dd2420bf950aa8f60c9ab8557
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=249a494+%5Ebf4b97c
----------------------------------------------------------------------------
a3a6fd8: makebootable: remove outdated "compatibility" options.
Fixes #3779.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
249a494: Removed dead code (CID: 1255314)
[ Theodore Kokkoris <t.kokkoris@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 14 deletions(-)
headers/private/userlandfs/private/Requests.h | 1 -
src/bin/makebootable/platform/bios_ia32/makebootable.cpp | 12 ------------
.../userlandfs/r5/headers/private/Requests.h | 1 -
############################################################################
Commit: a3a6fd837aa06942cf7e92f9ffb2c359f796f694
URL: http://cgit.haiku-os.org/haiku/commit/?id=a3a6fd8
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Wed Dec 3 16:58:00 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/3779
makebootable: remove outdated "compatibility" options.
Fixes #3779.
----------------------------------------------------------------------------
diff --git a/src/bin/makebootable/platform/bios_ia32/makebootable.cpp
b/src/bin/makebootable/platform/bios_ia32/makebootable.cpp
index 4428e2d..125bab6 100644
--- a/src/bin/makebootable/platform/bios_ia32/makebootable.cpp
+++ b/src/bin/makebootable/platform/bios_ia32/makebootable.cpp
@@ -87,11 +87,6 @@ const char *kUsage =
"Options:\n"
" -h, --help - Print this help text and exit.\n"
" --dry-run - Do everything but actually writing the boot block to
disk.\n"
-"\n"
-"[compatibility]\n"
-" -alert - Compatibility option. Ignored.\n"
-" -full - Compatibility option. Ignored.\n"
-" -safe - Compatibility option. Fail when specified.\n"
;
@@ -271,17 +266,10 @@ main(int argc, const char *const *argv)
print_usage_and_exit(false);
} else if (strcmp(arg, "--dry-run") == 0) {
dryRun = true;
- } else if (strcmp(arg, "-alert") == 0) {
- // ignore
- } else if (strcmp(arg, "-full") == 0) {
- // ignore
} else if (strcmp(arg, "--start-offset") == 0) {
if (argi >= argc)
print_usage_and_exit(true);
startOffset = strtoll(argv[argi++], NULL, 0);
- } else if (strcmp(arg, "-safe") == 0) {
- fprintf(stderr, "Error: Sorry, BeOS R3 isn't
supported!\n");
- exit(1);
} else {
print_usage_and_exit(true);
}
############################################################################
Revision: hrev48430
Commit: 249a4944c397b19dd2420bf950aa8f60c9ab8557
URL: http://cgit.haiku-os.org/haiku/commit/?id=249a494
Author: Theodore Kokkoris <t.kokkoris@xxxxxxxxx>
Date: Wed Dec 3 14:48:52 2014 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Wed Dec 3 20:14:24 2014 UTC
Removed dead code (CID: 1255314)
----------------------------------------------------------------------------
diff --git a/headers/private/userlandfs/private/Requests.h
b/headers/private/userlandfs/private/Requests.h
index 3f11c8f..075c740 100644
--- a/headers/private/userlandfs/private/Requests.h
+++ b/headers/private/userlandfs/private/Requests.h
@@ -2393,7 +2393,6 @@ do_for_request(Request* request, Task& task)
default:
return B_BAD_DATA;
}
- return task(request);
}
status_t get_request_address_infos(Request* request, AddressInfo* infos,
diff --git
a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/private/Requests.h
b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/private/Requests.h
index 63bdde3..0a41567 100644
---
a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/private/Requests.h
+++
b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/private/Requests.h
@@ -1708,7 +1708,6 @@ do_for_request(Request* request, Task& task)
default:
return B_BAD_DATA;
}
- return task(request);
}
status_t get_request_address_infos(Request* request, AddressInfo* infos,
Other related posts:
- » [haiku-commits] haiku: hrev48430 - src/bin/makebootable/platform/bios_ia32 src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/private headers/private/userlandfs/private - pulkomandy
