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

Fixed warnings.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4901 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-10-01 01:55:49 +00:00
parent 3c0a986734
commit 394d5e16a8
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/add-ons/kernel/file_systems/bfs/btree/cache.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ shutdown_cache(BFile *file,int32 blockSize)
static status_t static status_t
readBlocks(BFile *file,uint32 num,uint32 size) readBlocks(BFile *file,uint32 num,uint32 size)
{ {
for (int32 i = gBlocks.CountItems();i <= num;i++) { for (uint32 i = gBlocks.CountItems(); i <= num; i++) {
void *buffer = malloc(size); void *buffer = malloc(size);
if (buffer == NULL) if (buffer == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
src/tests/add-ons/kernel/file_systems/bfs/btree/test.cpp
+15 -15
View File
@@ -88,38 +88,38 @@ bailOut()
void void
bailOutWithKey(void *key,uint16 length) bailOutWithKey(void *key, uint16 length)
{ {
dumpKey(key,length); dumpKey(key, length);
putchar('\n'); putchar('\n');
bailOut(); bailOut();
} }
void void
dumpKey(void *key,int32 length) dumpKey(void *key, int32 length)
{ {
switch (gType) { switch (gType) {
case S_STR_INDEX: case S_STR_INDEX:
printf("\"%s\" (%ld bytes)",key,length); printf("\"%s\" (%ld bytes)", (char *)key, length);
break; break;
case S_INT_INDEX: case S_INT_INDEX:
printf("%ld",*(int32 *)key); printf("%ld", *(int32 *)key);
break; break;
case S_UINT_INDEX: case S_UINT_INDEX:
printf("%lu",*(uint32 *)key); printf("%lu", *(uint32 *)key);
break; break;
case S_LONG_LONG_INDEX: case S_LONG_LONG_INDEX:
printf("%Ld",*(int64 *)key); printf("%Ld", *(int64 *)key);
break; break;
case S_ULONG_LONG_INDEX: case S_ULONG_LONG_INDEX:
printf("%Lu",*(uint64 *)key); printf("%Lu", *(uint64 *)key);
break; break;
case S_FLOAT_INDEX: case S_FLOAT_INDEX:
printf("%g",*(float *)key); printf("%g", *(float *)key);
break; break;
case S_DOUBLE_INDEX: case S_DOUBLE_INDEX:
printf("%g",*(double *)key); printf("%g", *(double *)key);
break; break;
} }
if ((gType == S_INT_INDEX || gType == S_UINT_INDEX || gType == S_FLOAT_INDEX) if ((gType == S_INT_INDEX || gType == S_UINT_INDEX || gType == S_FLOAT_INDEX)
@@ -243,11 +243,11 @@ fillBuffer(void *buffer,int32 start)
bool bool
findKey(void *key,int32 length,int32 maxIndex) findKey(void *key, int32 length, int32 maxIndex)
{ {
for (int32 i = length;i < maxIndex;i += MAX_STRING - MIN_STRING) { for (int32 i = length;i < maxIndex;i += MAX_STRING - MIN_STRING) {
if (length == gKeys[i].length if (length == (int32)gKeys[i].length
&& !memcpy(key,gKeys[i].data,length)) && !memcpy(key, gKeys[i].data, length))
return true; return true;
} }
return false; return false;
@@ -606,8 +606,8 @@ usage(char *program)
"\t-t\ttype is one of string, int32, uint32, int64, uint64, float,\n" "\t-t\ttype is one of string, int32, uint32, int64, uint64, float,\n"
"\t\tor double; defaults to string.\n" "\t\tor double; defaults to string.\n"
"\t-n\tkeys is the number of keys to be used,\n" "\t-n\tkeys is the number of keys to be used,\n"
"\t\tminimum is 1, defaults to %ld.\n" "\t\tminimum is 1, defaults to %d.\n"
"\t-i\titerations is the number of the test cycles, defaults to %ld.\n" "\t-i\titerations is the number of the test cycles, defaults to %d.\n"
"\t-r\tthe seed for the random function, defaults to %ld.\n" "\t-r\tthe seed for the random function, defaults to %ld.\n"
"\t-h\tremoves the keys and start over again for x times.\n" "\t-h\tremoves the keys and start over again for x times.\n"
"\t-e\texcessive validity tests: tree contents will be tested after every operation\n" "\t-e\texcessive validity tests: tree contents will be tested after every operation\n"