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
This commit is contained in:
parent
4a893da100
commit
5133bded7f
@ -8,12 +8,6 @@
|
|||||||
#include <OS.h>
|
#include <OS.h>
|
||||||
#include <driver_settings.h>
|
#include <driver_settings.h>
|
||||||
|
|
||||||
// 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 <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -386,14 +380,14 @@ load_driver_settings_from_file(int file)
|
|||||||
static bool
|
static bool
|
||||||
put_string(char **_buffer, size_t *_bufferSize, char *string)
|
put_string(char **_buffer, size_t *_bufferSize, char *string)
|
||||||
{
|
{
|
||||||
size_t length, reserved, quotes, sizeNeeded;
|
size_t length, reserved, quotes;
|
||||||
char *buffer = *_buffer, c;
|
char *buffer = *_buffer, c;
|
||||||
bool quoted;
|
bool quoted;
|
||||||
|
|
||||||
if (string == NULL)
|
if (string == NULL)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
for (length = reserved = quotes = 0; c = string[length]; length++) {
|
for (length = reserved = quotes = 0; (c = string[length]) != '\0'; length++) {
|
||||||
if (c == '"')
|
if (c == '"')
|
||||||
quotes++;
|
quotes++;
|
||||||
else if (is_word_break(c))
|
else if (is_word_break(c))
|
||||||
@ -412,7 +406,7 @@ put_string(char **_buffer, size_t *_bufferSize, char *string)
|
|||||||
if (quoted)
|
if (quoted)
|
||||||
*(buffer++) = '"';
|
*(buffer++) = '"';
|
||||||
|
|
||||||
for (;c = string[0]; string++) {
|
for (;(c = string[0]) != '\0'; string++) {
|
||||||
if (c == '"')
|
if (c == '"')
|
||||||
*(buffer++) = '\\';
|
*(buffer++) = '\\';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user