RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 21-Sep-2010 23:44:52
Branch: HEAD Handle: 2010092121445200
Modified files:
rpm/tests/mongo all_types.c benchmark.c
Log:
- mongo: clean up tests/mongo/* compiler warnings.
Summary:
Revision Changes Path
1.3 +4 -5 rpm/tests/mongo/all_types.c
1.4 +32 -31 rpm/tests/mongo/benchmark.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/all_types.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 all_types.c
--- rpm/tests/mongo/all_types.c 17 Sep 2010 22:49:45 -0000 1.2
+++ rpm/tests/mongo/all_types.c 21 Sep 2010 21:44:52 -0000 1.3
@@ -31,7 +31,7 @@
bson_append_oid(&bb, "oid", &oid);
bson_append_bool(&bb, "b", 1);
- bson_append_date(&bb, "date", 0x0102030405060708);
+ bson_append_date(&bb, "date", 0x0102030405060708ULL);
bson_append_null(&bb, "n");
bson_append_regex(&bb, "r", "^asdf", "imx");
/* no dbref test (deprecated) */
@@ -39,7 +39,6 @@
bson_append_symbol(&bb, "symbol", "SYMBOL");
{
- char hex[30];
bson_buffer scope_buf;
bson scope;
bson_buffer_init(&scope_buf);
@@ -51,7 +50,7 @@
}
/* no timestamp test (internal) */
- bson_append_long(&bb, "l", 0x1122334455667788);
+ bson_append_long(&bb, "l", 0x1122334455667788ULL);
bson_from_buffer(&b, &bb);
@@ -124,7 +123,7 @@
ASSERT(bson_iterator_next(&it) == bson_date);
ASSERT(bson_iterator_type(&it) == bson_date);
ASSERT(!strcmp(bson_iterator_key(&it), "date"));
- ASSERT(bson_iterator_date(&it) == 0x0102030405060708);
+ ASSERT(bson_iterator_date(&it) == 0x0102030405060708ULL);
ASSERT(bson_iterator_more(&it));
ASSERT(bson_iterator_next(&it) == bson_null);
@@ -178,7 +177,7 @@
ASSERT(bson_iterator_next(&it) == bson_long);
ASSERT(bson_iterator_type(&it) == bson_long);
ASSERT(!strcmp(bson_iterator_key(&it), "l"));
- ASSERT(bson_iterator_long(&it) == 0x1122334455667788);
+ ASSERT(bson_iterator_long(&it) == 0x1122334455667788ULL);
ASSERT(bson_iterator_more(&it));
ASSERT(bson_iterator_next(&it) == bson_eoo);
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/mongo/benchmark.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 benchmark.c
--- rpm/tests/mongo/benchmark.c 18 Sep 2010 03:25:03 -0000 1.3
+++ rpm/tests/mongo/benchmark.c 21 Sep 2010 21:44:52 -0000 1.4
@@ -87,7 +87,7 @@
bson_from_buffer(out, &bb);
}
-static void serialize_small_test(){
+static void serialize_small_test(void){
int i;
bson b;
for (i=0; i<PER_TRIAL; i++){
@@ -95,7 +95,7 @@
bson_destroy(&b);
}
}
-static void serialize_medium_test(){
+static void serialize_medium_test(void){
int i;
bson b;
for (i=0; i<PER_TRIAL; i++){
@@ -103,7 +103,7 @@
bson_destroy(&b);
}
}
-static void serialize_large_test(){
+static void serialize_large_test(void){
int i;
bson b;
for (i=0; i<PER_TRIAL; i++){
@@ -111,7 +111,7 @@
bson_destroy(&b);
}
}
-static void single_insert_small_test(){
+static void single_insert_small_test(void){
int i;
bson b;
for (i=0; i<PER_TRIAL; i++){
@@ -121,7 +121,7 @@
}
}
-static void single_insert_medium_test(){
+static void single_insert_medium_test(void){
int i;
bson b;
for (i=0; i<PER_TRIAL; i++){
@@ -131,7 +131,7 @@
}
}
-static void single_insert_large_test(){
+static void single_insert_large_test(void){
int i;
bson b;
for (i=0; i<PER_TRIAL; i++){
@@ -141,7 +141,7 @@
}
}
-static void index_insert_small_test(){
+static void index_insert_small_test(void){
int i;
bson b;
ASSERT(mongo_create_simple_index(conn, DB ".index.small", "x", 0, NULL));
@@ -152,7 +152,7 @@
}
}
-static void index_insert_medium_test(){
+static void index_insert_medium_test(void){
int i;
bson b;
ASSERT(mongo_create_simple_index(conn, DB ".index.medium", "x", 0, NULL));
@@ -163,7 +163,7 @@
}
}
-static void index_insert_large_test(){
+static void index_insert_large_test(void){
int i;
bson b;
ASSERT(mongo_create_simple_index(conn, DB ".index.large", "x", 0, NULL));
@@ -174,7 +174,7 @@
}
}
-static void batch_insert_small_test(){
+static void batch_insert_small_test(void){
int i, j;
bson b[BATCH_SIZE];
bson *bp[BATCH_SIZE];
@@ -192,7 +192,7 @@
}
}
-static void batch_insert_medium_test(){
+static void batch_insert_medium_test(void){
int i, j;
bson b[BATCH_SIZE];
bson *bp[BATCH_SIZE];
@@ -210,7 +210,7 @@
}
}
-static void batch_insert_large_test(){
+static void batch_insert_large_test(void){
int i, j;
bson b[BATCH_SIZE];
bson *bp[BATCH_SIZE];
@@ -245,13 +245,13 @@
}
}
-static void find_one_noindex_small_test() {find_one(DB ".single.small");}
-static void find_one_noindex_medium_test() {find_one(DB ".single.medium");}
-static void find_one_noindex_large_test() {find_one(DB ".single.large");}
-
-static void find_one_index_small_test() {find_one(DB ".index.small");}
-static void find_one_index_medium_test() {find_one(DB ".index.medium");}
-static void find_one_index_large_test() {find_one(DB ".index.large");}
+static void find_one_noindex_small_test(void) {find_one(DB ".single.small");}
+static void find_one_noindex_medium_test(void) {find_one(DB ".single.medium");}
+static void find_one_noindex_large_test(void) {find_one(DB ".single.large");}
+
+static void find_one_index_small_test(void) {find_one(DB ".index.small");}
+static void find_one_index_medium_test(void) {find_one(DB ".index.medium");}
+static void find_one_index_large_test(void) {find_one(DB ".index.large");}
static void find(const char* ns){
bson b;
@@ -270,13 +270,13 @@
}
}
-static void find_noindex_small_test() {find(DB ".single.small");}
-static void find_noindex_medium_test() {find(DB ".single.medium");}
-static void find_noindex_large_test() {find(DB ".single.large");}
-
-static void find_index_small_test() {find(DB ".index.small");}
-static void find_index_medium_test() {find(DB ".index.medium");}
-static void find_index_large_test() {find(DB ".index.large");}
+static void find_noindex_small_test(void) {find(DB ".single.small");}
+static void find_noindex_medium_test(void) {find(DB ".single.medium");}
+static void find_noindex_large_test(void) {find(DB ".single.large");}
+
+static void find_index_small_test(void) {find(DB ".index.small");}
+static void find_index_medium_test(void) {find(DB ".index.medium");}
+static void find_index_large_test(void) {find(DB ".index.large");}
static void find_range(const char* ns){
@@ -308,11 +308,11 @@
}
}
-static void find_range_small_test() {find_range(DB ".index.small");}
-static void find_range_medium_test() {find_range(DB ".index.medium");}
-static void find_range_large_test() {find_range(DB ".index.large");}
+static void find_range_small_test(void) {find_range(DB ".index.small");}
+static void find_range_medium_test(void) {find_range(DB ".index.medium");}
+static void find_range_large_test(void) {find_range(DB ".index.large");}
-typedef void(*nullary)();
+typedef void(*nullary)(void);
static void time_it(nullary func, const char* name, bson_bool_t gle){
double timer;
double ops;
@@ -347,7 +347,8 @@
#define TIME(func, gle) (time_it(func, #func, gle))
-static void clean(){
+static void clean(void)
+{
bson b;
if (!mongo_cmd_drop_db(conn, DB)){
printf("failed to drop db\n");
@@ .
Received on Tue Sep 21 23:44:52 2010