i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/debug: Use strchrnul and memchr in parsing.

Browse Source 
Slight efficiency improvement, and simplifies the code a bit too.

Change-Id: I502409a9aee260c3d0ad1c9003567e46c03b241b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10596
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2026-03-27 18:23:31 +00:00
committed by waddlesplash
parent 0ed6a7bdeb
commit 2b3a46cc1b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/debug/safemode_settings.cpp
+7 -5
View File
@@ -6,6 +6,7 @@
#include <safemode.h> #include <safemode.h>
#define _DEFAULT_SOURCE
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
@@ -43,20 +44,21 @@ get_option_from_kernel_args(kernel_args* args, const char* settingsName,
// Unfortunately we can't just use parse_driver_settings_string(), since // Unfortunately we can't just use parse_driver_settings_string(), since
// we might not have a working heap yet. So we do very limited parsing // we might not have a working heap yet. So we do very limited parsing
// ourselves. // ourselves.
const char* settingsEnd = settings + strlen(settings);
int32 parameterLevel = 0; int32 parameterLevel = 0;
while (*settings != '\0') { while (*settings != '\0') {
// find end of line // find end of line
const char* lineEnd = strchr(settings, '\n'); const char* lineEnd = strchrnul(settings, '\n');
const char* nextLine; const char* nextLine;
if (lineEnd != NULL) if (*lineEnd != '\0')
nextLine = lineEnd + 1; nextLine = lineEnd + 1;
else else
nextLine = lineEnd = settingsEnd; nextLine = lineEnd;
// ignore any trailing comments // ignore any trailing comments
lineEnd = std::find(settings, lineEnd, '#'); const char* commentStart = (const char*)memchr(settings, '#', lineEnd - settings);
if (commentStart != NULL)
lineEnd = commentStart;
const char* nameStart = NULL; const char* nameStart = NULL;
const char* nameEnd = NULL; const char* nameEnd = NULL;