Commit 6ec2915f authored by Claes Sjofors's avatar Claes Sjofors

printf format for size_t changed to %zd

parent ed5f10da
...@@ -413,9 +413,9 @@ hash_Print ( ...@@ -413,9 +413,9 @@ hash_Print (
ghtp = htp->ghtp; ghtp = htp->ghtp;
printf(" size............: %ld\n", ghtp->size); printf(" size............: %zd\n", ghtp->size);
printf(" key_size........: %ld\n", ghtp->key_size); printf(" key_size........: %zd\n", ghtp->key_size);
printf(" record_size.....: %ld\n", ghtp->record_size); printf(" record_size.....: %zd\n", ghtp->record_size);
printf(" key_offset......: %d\n", (int)ghtp->key_offset); printf(" key_offset......: %d\n", (int)ghtp->key_offset);
printf(" link_offset.....: %d\n", (int)ghtp->link_offset); printf(" link_offset.....: %d\n", (int)ghtp->link_offset);
printf(" key_type........: %d\n", ghtp->key_type); printf(" key_type........: %d\n", ghtp->key_type);
......
...@@ -989,7 +989,7 @@ static void printstat(DbEnv *ep, const char *s) ...@@ -989,7 +989,7 @@ static void printstat(DbEnv *ep, const char *s)
printf(" nconflicts...: %d\n", lp->st_nconflicts); printf(" nconflicts...: %d\n", lp->st_nconflicts);
#endif #endif
printf(" ndeadlocks...: %d\n", lp->st_ndeadlocks); printf(" ndeadlocks...: %d\n", lp->st_ndeadlocks);
printf(" regsize......: %ld\n", lp->st_regsize); printf(" regsize......: %zd\n", lp->st_regsize);
printf(" region_wait..: %d\n", lp->st_region_wait); printf(" region_wait..: %d\n", lp->st_region_wait);
printf(" region_nowait: %d\n", lp->st_region_nowait); printf(" region_nowait: %d\n", lp->st_region_nowait);
printf("\n"); printf("\n");
......
...@@ -827,7 +827,7 @@ wb_dbs::importDbody(pwr_tOid oid, size_t size, void *body) ...@@ -827,7 +827,7 @@ wb_dbs::importDbody(pwr_tOid oid, size_t size, void *body)
} }
if (oep->dbody.size == 0) { if (oep->dbody.size == 0) {
if (size != 0) printf("error dbody size %ld %s\n", size, cdh_ObjidToString(0,oid,0)); if (size != 0) printf("error dbody size %zd %s\n", size, cdh_ObjidToString(0,oid,0));
return true; return true;
} }
...@@ -885,7 +885,7 @@ wb_dbs::importRbody(pwr_tOid oid, size_t size, void *body) ...@@ -885,7 +885,7 @@ wb_dbs::importRbody(pwr_tOid oid, size_t size, void *body)
getAliasServer(oep, body); getAliasServer(oep, body);
if (oep->rbody.size == 0) { if (oep->rbody.size == 0) {
if (size != 0) printf("error rbody size %ld %s\n", size, cdh_ObjidToString(0,oid,0)); if (size != 0) printf("error rbody size %zd %s\n", size, cdh_ObjidToString(0,oid,0));
return true; return true;
} }
......
...@@ -228,7 +228,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o) ...@@ -228,7 +228,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o)
lock_object = 0; lock_object = 0;
if ( debug) if ( debug)
printf( "Store(F)x: %3d list: %3ld undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1, printf( "Store(F)x: %3d list: %3zd undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1,
(int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos); (int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos);
} }
...@@ -252,7 +252,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o) ...@@ -252,7 +252,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o)
while ( (int)poslist.size() > current_idx) { while ( (int)poslist.size() > current_idx) {
if ( debug) if ( debug)
printf( "Remove %ld\n", poslist.size()-1); printf( "Remove %zd\n", poslist.size()-1);
poslist.pop_back(); poslist.pop_back();
} }
...@@ -285,7 +285,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o) ...@@ -285,7 +285,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o)
while ( (int)poslist.size() > current_idx) { while ( (int)poslist.size() > current_idx) {
if ( debug) if ( debug)
printf( "Remove %ld\n", poslist.size()-1); printf( "Remove %zd\n", poslist.size()-1);
poslist.pop_back(); poslist.pop_back();
} }
...@@ -375,7 +375,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o) ...@@ -375,7 +375,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o)
current_idx++; current_idx++;
if ( debug) if ( debug)
printf( "Store idx: %3d list: %3ld undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1, printf( "Store idx: %3d list: %3zd undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1,
(int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos); (int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos);
return GE__SUCCESS; return GE__SUCCESS;
...@@ -398,7 +398,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o) ...@@ -398,7 +398,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o)
while ( (int)poslist.size() > current_idx) { while ( (int)poslist.size() > current_idx) {
if ( debug) if ( debug)
printf( "Remov idx: %3d list: %3ld undo: %10d redo: %10d\n", 0, poslist.size() - 1, printf( "Remov idx: %3d list: %3zd undo: %10d redo: %10d\n", 0, poslist.size() - 1,
(int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos); (int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos);
poslist.pop_back(); poslist.pop_back();
} }
...@@ -461,7 +461,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o) ...@@ -461,7 +461,7 @@ int GraphJournal::store( journal_eAction action, grow_tObject o)
current_idx++; current_idx++;
if ( debug) if ( debug)
printf( "Store idx: %3d list: %3ld undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1, printf( "Store idx: %3d list: %3zd undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1,
(int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos); (int)poslist[poslist.size()-1].undo_pos, (int)poslist[poslist.size()-1].redo_pos);
return GE__SUCCESS; return GE__SUCCESS;
...@@ -478,7 +478,7 @@ int GraphJournal::undo() ...@@ -478,7 +478,7 @@ int GraphJournal::undo()
return 0; return 0;
if ( debug) if ( debug)
printf( "Undo idx: %3d list: %3ld undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1, printf( "Undo idx: %3d list: %3zd undo: %10d redo: %10d\n", current_idx-1, poslist.size() - 1,
(int)poslist[current_idx-1].undo_pos, (int)poslist[current_idx-1].redo_pos); (int)poslist[current_idx-1].undo_pos, (int)poslist[current_idx-1].redo_pos);
fp.seekp( poslist[current_idx-1].undo_pos); fp.seekp( poslist[current_idx-1].undo_pos);
...@@ -555,7 +555,7 @@ int GraphJournal::redo() ...@@ -555,7 +555,7 @@ int GraphJournal::redo()
return 0; return 0;
if ( debug) if ( debug)
printf( "Redo idx: %3d list: %3ld undo: %10d redo: %10d\n", current_idx, poslist.size() - 1, printf( "Redo idx: %3d list: %3zd undo: %10d redo: %10d\n", current_idx, poslist.size() - 1,
(int)poslist[current_idx].undo_pos, (int)poslist[current_idx].redo_pos); (int)poslist[current_idx].undo_pos, (int)poslist[current_idx].redo_pos);
if ( poslist[current_idx].redo_pos == -1) if ( poslist[current_idx].redo_pos == -1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment