From 5e3eb88b1c471f69cfbe5326b0df57f5fdce9b50 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Tue, 24 May 2011 12:10:57 +0000 Subject: [PATCH] Cleanup: no need for parsing since the kernel settings will handle semicolon separated options directly. Thanks Axel! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41707 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/loader/menu.cpp | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp index 5068adb403..52934a6115 100644 --- a/src/system/boot/loader/menu.cpp +++ b/src/system/boot/loader/menu.cpp @@ -529,34 +529,16 @@ debug_menu_add_advanced_option(Menu* menu, MenuItem* item) sizeof(buffer) - 1); if (size > 0) { - char* token = NULL; - char *bufferOffset = buffer; - char *separator = NULL; - uint32 pos = strlen(sSafeModeOptionsBuffer); - do { - token = bufferOffset; - separator = strchr(bufferOffset, ','); - if (separator != NULL) { - *separator = '\0'; - bufferOffset = separator + 1; - } else { - token = bufferOffset; - bufferOffset = NULL; - } - uint32 length = strlen(token) + 1; - if (pos + length < sizeof(sSafeModeOptionsBuffer)) { - strlcat(sSafeModeOptionsBuffer, token, - sizeof(sSafeModeOptionsBuffer)); - sSafeModeOptionsBuffer[pos + length - 1] = '\n'; - pos += length; - } else - break; - } while (token != NULL); + buffer[size] = '\n'; + if (pos + size + 1 < sizeof(sSafeModeOptionsBuffer)) + strlcat(sSafeModeOptionsBuffer, buffer, + sizeof(sSafeModeOptionsBuffer)); } return true; } + static status_t save_syslog_to_volume(Directory* directory) {