Reacted on -Wsign-compare warnings of gcc

This commit is contained in:
Thomas Schmitt 2011-05-09 18:14:29 +00:00
parent 37987ecfe6
commit 7e2d7e5997
3 changed files with 6 additions and 4 deletions

View File

@ -365,7 +365,8 @@ int isoburn_adjust_target_iso_head(struct isoburn *o,
uint8_t *new_buf; uint8_t *new_buf;
uint32_t new_size; uint32_t new_size;
if(o->target_iso_head_size == Libisoburn_target_head_sizE + 2048 * offst) if((uint32_t) o->target_iso_head_size ==
Libisoburn_target_head_sizE + 2048 * offst)
return(1); return(1);
new_size= Libisoburn_target_head_sizE + 2048 * offst; new_size= Libisoburn_target_head_sizE + 2048 * offst;
new_buf= calloc(1, new_size); new_buf= calloc(1, new_size);
@ -375,7 +376,8 @@ int isoburn_adjust_target_iso_head(struct isoburn *o,
return(-1); return(-1);
} }
memcpy(new_buf, o->target_iso_head, memcpy(new_buf, o->target_iso_head,
o->target_iso_head_size < new_size ? o->target_iso_head_size : new_size); (uint32_t) o->target_iso_head_size < new_size ?
(uint32_t) o->target_iso_head_size : new_size);
free(o->target_iso_head); free(o->target_iso_head);
o->target_iso_head= new_buf; o->target_iso_head= new_buf;
o->target_iso_head_size= new_size; o->target_iso_head_size= new_size;

View File

@ -429,7 +429,7 @@ static int isoburn_inspect_partition(struct isoburn *o, uint32_t img_size,
o->loaded_partition_offset= offst; o->loaded_partition_offset= offst;
/* If the partition start is too large: Report but do not accept. */ /* If the partition start is too large: Report but do not accept. */
if(offst > max_offst) { /* Not more than 1 MB of .target_iso_head */ if(offst > (uint32_t) max_offst) {/* Not more than 1 MB of .target_iso_head */
sprintf(msg, sprintf(msg,
"Detected partition offset of %.f blocks. Maximum for load buffer is %d", "Detected partition offset of %.f blocks. Maximum for load buffer is %d",
(double) offst, max_offst); (double) offst, max_offst);

View File

@ -1 +1 @@
#define Xorriso_timestamP "2011.05.09.181239" #define Xorriso_timestamP "2011.05.09.181449"