From 5133bded7fc956a11a8315ed04ca78bca79bf471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 16 Jun 2003 19:56:33 +0000 Subject: [PATCH] Fixed some warnings that occured with -Wall - the tests should be compiled with this by default, like the whole project, too. Removed the B_FILE_NAME_LENGTH definition, since our headers are now correct. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3546 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/os/driver_settings.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/kernel/libroot/os/driver_settings.c b/src/kernel/libroot/os/driver_settings.c index 66ece37144..8a2c565a0d 100644 --- a/src/kernel/libroot/os/driver_settings.c +++ b/src/kernel/libroot/os/driver_settings.c @@ -8,12 +8,6 @@ #include #include -// this definition is currently missing from the headers above... -// just a small to let it compile fine in the OpenBeOS tree -#ifndef B_FILE_NAME_LENGTH -# define B_FILE_NAME_LENGTH 256 -#endif - #include #include #include @@ -386,14 +380,14 @@ load_driver_settings_from_file(int file) static bool put_string(char **_buffer, size_t *_bufferSize, char *string) { - size_t length, reserved, quotes, sizeNeeded; + size_t length, reserved, quotes; char *buffer = *_buffer, c; bool quoted; if (string == NULL) return true; - for (length = reserved = quotes = 0; c = string[length]; length++) { + for (length = reserved = quotes = 0; (c = string[length]) != '\0'; length++) { if (c == '"') quotes++; else if (is_word_break(c)) @@ -412,7 +406,7 @@ put_string(char **_buffer, size_t *_bufferSize, char *string) if (quoted) *(buffer++) = '"'; - for (;c = string[0]; string++) { + for (;(c = string[0]) != '\0'; string++) { if (c == '"') *(buffer++) = '\\';