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

driver_settings: Use strchrnul to skip comments.

Browse Source 
More optimized than just the simple loop.
This commit is contained in:
Augustin Cavalier
2026-03-30 18:21:49 -04:00
parent bace3a82c5
commit 53b69c0037
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/driver_settings.cpp
+6 -7
View File
@@ -28,6 +28,10 @@
# undef _KERNEL_MODE # undef _KERNEL_MODE
#endif #endif
#ifndef _DEFAULT_SOURCE
#define _DEFAULT_SOURCE
#endif
#include <BeBuild.h> #include <BeBuild.h>
#include <directories.h> #include <directories.h>
#include <driver_settings.h> #include <driver_settings.h>
@@ -57,9 +61,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#ifndef B_BUFFER_OVERFLOW
# define B_BUFFER_OVERFLOW B_ERROR
#endif
#define SETTINGS_DIRECTORY "/kernel/drivers/" #define SETTINGS_DIRECTORY "/kernel/drivers/"
#define SETTINGS_MAGIC 'DrvS' #define SETTINGS_MAGIC 'DrvS'
@@ -178,10 +179,8 @@ get_word(char **_pos, char **_word, int32 assignmentMode, bool allowNewLine)
|| (!allowNewLine && (pos[0] == '\t' || pos[0] == ' ')) || (!allowNewLine && (pos[0] == '\t' || pos[0] == ' '))
|| (assignmentMode == ALLOW_ASSIGNMENT && pos[0] == '='))) { || (assignmentMode == ALLOW_ASSIGNMENT && pos[0] == '='))) {
// skip any comment lines // skip any comment lines
if (pos[0] == '#') { if (pos[0] == '#')
while (pos[0] && pos[0] != '\n') pos = strchrnul(pos, '\n');
pos++;
}
pos++; pos++;
} }