浏览代码

fix printf format

Francois Perrad 10 年之前
父节点
当前提交
89029e452e
共有 4 个文件被更改,包括 25 次插入24 次删除
  1. 1 1
      tests/keystat.c
  2. 16 16
      tests/test43.c
  3. 3 3
      tests/test47.c
  4. 5 4
      tests/test58.c

+ 1 - 1
tests/keystat.c

@@ -206,7 +206,7 @@ int main(int argc, char *argv[]) {
     timersub(&end_tm, &start_tm, &elapsed_tm3);
 
     if (err == 0) {
-        printf("%.3f,%d,%d,%d,%s,%ld,%ld,%ld\n",
+        printf("%.3f,%u,%u,%d,%s,%ld,%ld,%ld\n",
         1-(1.0*keys->hh.tbl->nonideal_items/keys->hh.tbl->num_items),
         keys->hh.tbl->num_items,
         keys->hh.tbl->num_buckets,

+ 16 - 16
tests/test43.c

@@ -12,34 +12,34 @@ int main() {
   UT_icd pairicd = { sizeof(intpair_t),NULL,NULL,NULL};
   size_t zero=0;
   utarray_new(pairs, &pairicd);
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   it.a = 1; it.b=2; utarray_push_back(pairs, &it); printf("push\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   ip = (intpair_t*)utarray_back(pairs);
   printf("back is %d %d\n", ip->a, ip->b);
   utarray_pop_back(pairs); printf("pop\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   it.a = 1; it.b=2; utarray_push_back(pairs, &it); printf("push\n");
   it.a = 3; it.b=4; utarray_push_back(pairs, &it); printf("push\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   ip=NULL;
   while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
   utarray_erase(pairs,0,1); printf("erase [0]\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
   it.a = 1; it.b=2; utarray_push_back(pairs, &it); printf("push\n");
   while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
   utarray_clear(pairs); printf("clear\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   utarray_extend_back(pairs); printf("extend\n");
   ip = (intpair_t*)utarray_back(pairs);
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   printf("ip points to [0] ? %s\n", (ip==(intpair_t*)utarray_front(pairs)) ? "yes" : "no");
   it.a = 1; it.b=2; utarray_push_back(pairs, &it); printf("push\n");
   ip=NULL;
   while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
   utarray_erase(pairs,1,1); printf("erase [1]\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
   it.a = 3; it.b=4; utarray_push_back(pairs, &it); printf("push\n");
   for(ip=(intpair_t*)utarray_front(pairs);ip;ip=(intpair_t*)utarray_next(pairs,ip)) {
@@ -49,27 +49,27 @@ int main() {
   printf("back is %d %d\n", ip->a, ip->b);
   utarray_new(pairs_cpy, &pairicd);
   utarray_concat(pairs_cpy, pairs);  printf("copy\n");
-  printf("cpy length is %d\n", utarray_len(pairs_cpy));
+  printf("cpy length is %u\n", utarray_len(pairs_cpy));
   ip=NULL;
   while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
   it.a=5; it.b=6; utarray_insert(pairs_cpy, &it, 0); printf("insert cpy[0]\n");
-  printf("cpy length is %d\n", utarray_len(pairs_cpy));
+  printf("cpy length is %u\n", utarray_len(pairs_cpy));
   while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
   utarray_erase(pairs_cpy,0,2); printf("erase cpy [0] [1]\n");
-  printf("cpy length is %d\n", utarray_len(pairs_cpy));
+  printf("cpy length is %u\n", utarray_len(pairs_cpy));
   while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
   utarray_inserta(pairs_cpy, pairs, 1); printf("inserta at cpy[1]\n");
-  printf("cpy length is %d\n", utarray_len(pairs_cpy));
+  printf("cpy length is %u\n", utarray_len(pairs_cpy));
   while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
   utarray_free(pairs_cpy); printf("free cpy\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   utarray_resize(pairs, 30); printf("resize to 30\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
   utarray_resize(pairs, 1); printf("resize to 1\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   utarray_resize(pairs, zero); printf("resize to 0\n");
-  printf("length is %d\n", utarray_len(pairs));
+  printf("length is %u\n", utarray_len(pairs));
   utarray_free(pairs); printf("free\n");
   return 0;
 }

+ 3 - 3
tests/test47.c

@@ -16,11 +16,11 @@ int main() {
     utstring_concat(s,t);
     printf("%s\n", utstring_body(s));
     utstring_clear(t);
-    printf("cleared, length t now: %d\n", utstring_len(t));
-    printf("length s now: %d\n", utstring_len(s));
+    printf("cleared, length t now: %u\n", utstring_len(t));
+    printf("length s now: %u\n", utstring_len(s));
     utstring_printf(t,"one %d two %u three %s", 1, 2, "(3)");
     printf("%s\n", utstring_body(t));
-    printf("length t now: %d\n", utstring_len(t));
+    printf("length t now: %u\n", utstring_len(t));
 
 
     utstring_free(s);

+ 5 - 4
tests/test58.c

@@ -9,7 +9,8 @@ typedef struct example_user_t {
 } example_user_t;
 
 int main(int argc,char *argv[]) {
-    int i,c;
+    int i;
+    unsigned c;
     example_user_t *user, *tmp, *users=NULL;
 
     /* create elements */
@@ -27,7 +28,7 @@ int main(int argc,char *argv[]) {
 
 
     c = HASH_COUNT(users);
-    printf("%d users. Deleting odd id's...\n", c);
+    printf("%u users. Deleting odd id's...\n", c);
     /* delete the odd id's */
     HASH_ITER(hh, users, user, tmp) {
         if (user->id & 1) HASH_DEL(users,user);
@@ -39,14 +40,14 @@ int main(int argc,char *argv[]) {
     }
 
     c = HASH_COUNT(users);
-    printf("%d users. Deleting remaining id's...\n", c);
+    printf("%u users. Deleting remaining id's...\n", c);
     /* delete all that are left */
     HASH_ITER(hh, users, user, tmp) {
         HASH_DEL(users,user);
     }
 
     c = HASH_COUNT(users);
-    printf("%d users.\n", c);
+    printf("%u users.\n", c);
     /* show the hash */
     for(user=users; user != NULL; user=(example_user_t*)(user->hh.next)) {
         printf("user %d, cookie %d\n", user->id, user->cookie);