diff options
author | Jean-Luc Peurière <jlp@nerim.net> | 2005-06-04 20:22:50 +0400 |
---|---|---|
committer | Jean-Luc Peurière <jlp@nerim.net> | 2005-06-04 20:22:50 +0400 |
commit | f38e0686d909aa0d2882c197aeff59eeefa17081 (patch) | |
tree | 7f2d4a2a3324fa915427bdec590a9654366ed17e /source/blender/blenlib | |
parent | 0f82931e5fe89ed245a03a4608e524c2423c0d64 (diff) |
new round of warning fixes. we are now down to 24 with Xcode on blender
alone with the following flags :
-Wall -Wno-char-subscripts -Wno-missing-braces.
the only one still worrying me is in rand.c line 57 :
rand.c:57: integer constant is too large for "long" type
but i have no clue about how correct cross-compiler and 32/64 bits friendly
see also my mail to commiter list for signed/unsigned issues
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 1f64ffbd79f..66c2e364ea3 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -461,7 +461,7 @@ ScFillVert *addedgetoscanlist(EditEdge *eed, int len) sc= (ScFillVert *)bsearch(&scsearch,scdata,len, sizeof(ScFillVert), vergscdata); - if(sc==0) printf("Error in search edge: %x\n",eed); + if(sc==0) printf("Error in search edge: %lx\n",eed); else if(addedgetoscanvert(sc,eed)==0) return sc; return 0; diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index def44bb69f2..25327c4943e 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -396,14 +396,14 @@ void BLI_adddirstrings() strftime(datum, 32, "%d-%b-%y %R", tm); if (st_size < 1000) { - sprintf(size, "%10d", st_size); + sprintf(size, "%10d", (int) st_size); } else if (st_size < 1000 * 1000) { - sprintf(size, "%6d %03d", st_size / 1000, st_size % 1000); + sprintf(size, "%6d %03d", (int) (st_size / 1000), (int) (st_size % 1000)); } else if (st_size < 100 * 1000 * 1000) { - sprintf(size, "%2d %03d %03d", st_size / (1000 * 1000), (st_size / 1000) % 1000, st_size % 1000); + sprintf(size, "%2d %03d %03d", (int) (st_size / (1000 * 1000)), (int) ((st_size / 1000) % 1000), (int) ( st_size % 1000)); } else { - sprintf(size, "> %4.1f M", st_size / (1024.0 * 1024.0)); - sprintf(size, "%10d", st_size); + sprintf(size, "> %4.1f M", (double) (st_size / (1024.0 * 1024.0))); + sprintf(size, "%10d", (int) st_size); } sprintf(buf,"%s %s %10s %s", files[num].date, files[num].time, size, |