archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: fix mismatch in printf formating (int/unsigned int).

Browse Source 
Noisy and annoying with new gcc5...
This commit is contained in:
Bastien Montagne
2015-06-19 12:29:06 +02:00
parent 52e95ad3d3
commit 1cf1f48893
14 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -412,7 +412,7 @@ void DM_ensure_tessface(DerivedMesh *dm)
/* printf("info %s: polys -> ngons calculated\n", __func__); */ /* printf("info %s: polys -> ngons calculated\n", __func__); */
} }
else { else {
printf("warning %s: could not create tessfaces from %d polygons, dm->type=%d\n", printf("warning %s: could not create tessfaces from %d polygons, dm->type=%u\n",
__func__, numPolys, dm->type); __func__, numPolys, dm->type);
} }
} }

24
source/blender/blenkernel/intern/mesh_validate.c
View File

@@ -500,13 +500,13 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (mp->loopstart < 0 || mp->totloop < 3) { if (mp->loopstart < 0 || mp->totloop < 3) {
/* Invalid loop data. */ /* Invalid loop data. */
PRINT_ERR("\tPoly %u is invalid (loopstart: %u, totloop: %u)\n", PRINT_ERR("\tPoly %u is invalid (loopstart: %d, totloop: %d)\n",
sp->index, mp->loopstart, mp->totloop); sp->index, mp->loopstart, mp->totloop);
sp->invalid = true; sp->invalid = true;
} }
else if (mp->loopstart + mp->totloop > totloop) { else if (mp->loopstart + mp->totloop > totloop) {
/* Invalid loop data. */ /* Invalid loop data. */
PRINT_ERR("\tPoly %u uses loops out of range (loopstart: %u, loopend: %u, max nbr of loops: %u)\n", PRINT_ERR("\tPoly %u uses loops out of range (loopstart: %d, loopend: %d, max nbr of loops: %u)\n",
sp->index, mp->loopstart, mp->loopstart + mp->totloop - 1, totloop - 1); sp->index, mp->loopstart, mp->loopstart + mp->totloop - 1, totloop - 1);
sp->invalid = true; sp->invalid = true;
} }
@@ -552,7 +552,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
v2 = mloops[sp->loopstart + (j + 1) % mp->totloop].v; v2 = mloops[sp->loopstart + (j + 1) % mp->totloop].v;
if (!BLI_edgehash_haskey(edge_hash, v1, v2)) { if (!BLI_edgehash_haskey(edge_hash, v1, v2)) {
/* Edge not existing. */ /* Edge not existing. */
PRINT_ERR("\tPoly %u needs missing edge (%u, %u)\n", sp->index, v1, v2); PRINT_ERR("\tPoly %u needs missing edge (%d, %d)\n", sp->index, v1, v2);
if (do_fixes) if (do_fixes)
recalc_flag.edges = true; recalc_flag.edges = true;
else else
@@ -564,7 +564,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (do_fixes) { if (do_fixes) {
int prev_e = ml->e; int prev_e = ml->e;
ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, v1, v2)); ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, v1, v2));
PRINT_ERR("\tLoop %u has invalid edge reference (%u), fixed using edge %u\n", PRINT_ERR("\tLoop %u has invalid edge reference (%d), fixed using edge %u\n",
sp->loopstart + j, prev_e, ml->e); sp->loopstart + j, prev_e, ml->e);
} }
else { else {
@@ -580,7 +580,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (do_fixes) { if (do_fixes) {
int prev_e = ml->e; int prev_e = ml->e;
ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, v1, v2)); ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, v1, v2));
PRINT_ERR("\tPoly %u has invalid edge reference (%u), fixed using edge %u\n", PRINT_ERR("\tPoly %u has invalid edge reference (%d), fixed using edge %u\n",
sp->index, prev_e, ml->e); sp->index, prev_e, ml->e);
} }
else { else {
@@ -602,7 +602,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
if (*v != *prev_v) { if (*v != *prev_v) {
int dlt = v - prev_v; int dlt = v - prev_v;
if (dlt > 1) { if (dlt > 1) {
PRINT_ERR("\tPoly %u is invalid, it multi-uses vertex %u (%u times)\n", PRINT_ERR("\tPoly %u is invalid, it multi-uses vertex %d (%d times)\n",
sp->index, *prev_v, dlt); sp->index, *prev_v, dlt);
sp->invalid = true; sp->invalid = true;
} }
@@ -610,7 +610,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
} }
} }
if (v - prev_v > 1) { /* Don't forget final verts! */ if (v - prev_v > 1) { /* Don't forget final verts! */
PRINT_ERR("\tPoly %u is invalid, it multi-uses vertex %u (%u times)\n", PRINT_ERR("\tPoly %u is invalid, it multi-uses vertex %d (%d times)\n",
sp->index, *prev_v, (int)(v - prev_v)); sp->index, *prev_v, (int)(v - prev_v));
sp->invalid = true; sp->invalid = true;
} }
@@ -689,10 +689,10 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
} }
if ((p1_nv == p2_nv) && (memcmp(p1_v, p2_v, p1_nv * sizeof(*p1_v)) == 0)) { if ((p1_nv == p2_nv) && (memcmp(p1_v, p2_v, p1_nv * sizeof(*p1_v)) == 0)) {
if (do_verbose) { if (do_verbose) {
PRINT_ERR("\tPolys %u and %u use same vertices (%u", PRINT_ERR("\tPolys %u and %u use same vertices (%d",
prev_sp->index, sp->index, *p1_v); prev_sp->index, sp->index, *p1_v);
for (j = 1; j < p1_nv; j++) for (j = 1; j < p1_nv; j++)
PRINT_ERR(", %u", p1_v[j]); PRINT_ERR(", %d", p1_v[j]);
PRINT_ERR("), considering poly %u as invalid.\n", sp->index); PRINT_ERR("), considering poly %u as invalid.\n", sp->index);
} }
else { else {
@@ -741,7 +741,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
} }
/* Multi-used loops. */ /* Multi-used loops. */
else if (prev_end > sp->loopstart) { else if (prev_end > sp->loopstart) {
PRINT_ERR("\tPolys %u and %u share loops from %u to %u, considering poly %u as invalid.\n", PRINT_ERR("\tPolys %u and %u share loops from %d to %d, considering poly %u as invalid.\n",
prev_sp->index, sp->index, sp->loopstart, prev_end, sp->index); prev_sp->index, sp->index, sp->loopstart, prev_end, sp->index);
if (do_fixes) { if (do_fixes) {
REMOVE_POLY_TAG((&mpolys[sp->index])); REMOVE_POLY_TAG((&mpolys[sp->index]));
@@ -846,7 +846,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
int tot_elem = 0; int tot_elem = 0;
if (msel->index < 0) { if (msel->index < 0) {
PRINT_ERR("\tMesh select element %d type %d index is negative, " PRINT_ERR("\tMesh select element %u type %d index is negative, "
"resetting selection stack.\n", i, msel->type); "resetting selection stack.\n", i, msel->type);
free_flag.mselect = do_fixes; free_flag.mselect = do_fixes;
break; break;
@@ -865,7 +865,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
} }
if (msel->index > tot_elem) { if (msel->index > tot_elem) {
PRINT_ERR("\tMesh select element %d type %d index %d is larger than data array size %d, " PRINT_ERR("\tMesh select element %u type %d index %d is larger than data array size %d, "
"resetting selection stack.\n", i, msel->type, msel->index, tot_elem); "resetting selection stack.\n", i, msel->type, msel->index, tot_elem);
free_flag.mselect = do_fixes; free_flag.mselect = do_fixes;

3
source/blender/collada/ControllerExporter.cpp
View File

@@ -284,7 +284,8 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
} }
if (oob_counter > 0) { if (oob_counter > 0) {
fprintf(stderr, "Ignored %d Vertex weights which use index to non existing VGroup %ld.\n", oob_counter, joint_index_by_def_index.size()); fprintf(stderr, "Ignored %d Vertex weights which use index to non existing VGroup %lu.\n",
oob_counter, joint_index_by_def_index.size());
} }
} }

2
source/blender/editors/animation/anim_channels_edit.c
View File

@@ -874,7 +874,7 @@ static void rearrange_animchannel_add_to_islands(ListBase *islands, ListBase *sr
break; break;
} }
default: default:
printf("rearrange_animchannel_add_to_islands(): don't know how to handle channels of type %d\n", type); printf("rearrange_animchannel_add_to_islands(): don't know how to handle channels of type %u\n", type);
return; return;
} }

2
source/blender/editors/animation/anim_filter.c
View File

@@ -2922,7 +2922,7 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, eAnimFilter_F
/* unhandled */ /* unhandled */
default: default:
{ {
printf("ANIM_animdata_filter() - Invalid datatype argument %d\n", datatype); printf("ANIM_animdata_filter() - Invalid datatype argument %u\n", datatype);
break; break;
} }
} }

2
source/blender/editors/armature/pose_select.c
View File

@@ -821,7 +821,7 @@ static int pose_select_grouped_exec(bContext *C, wmOperator *op)
break; break;
default: default:
printf("pose_select_grouped() - Unknown selection type %d\n", type); printf("pose_select_grouped() - Unknown selection type %u\n", type);
break; break;
} }

2
source/blender/editors/interface/interface_handlers.c
View File

@@ -9002,7 +9002,7 @@ static int ui_handle_menu_event(
ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE); ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE);
} }
else { else {
printf("%s: error, but->menu_key type: %d\n", __func__, but->type); printf("%s: error, but->menu_key type: %u\n", __func__, but->type);
} }
break; break;

2
source/blender/editors/object/object_lattice.c
View File

@@ -713,7 +713,7 @@ static int lattice_flip_exec(bContext *C, wmOperator *op)
break; break;
default: default:
printf("lattice_flip(): Unknown flipping axis (%d)\n", axis); printf("lattice_flip(): Unknown flipping axis (%u)\n", axis);
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }

4
source/blender/gpu/intern/gpu_extensions.c
View File

@@ -1953,7 +1953,7 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
} }
if (retval == NULL) if (retval == NULL)
printf("Unable to create a GPUShader for builtin shader: %d\n", shader); printf("Unable to create a GPUShader for builtin shader: %u\n", shader);
return retval; return retval;
} }
@@ -1976,7 +1976,7 @@ GPUProgram *GPU_shader_get_builtin_program(GPUBuiltinProgram program)
} }
if (retval == NULL) if (retval == NULL)
printf("Unable to create a GPUProgram for builtin program: %d\n", program); printf("Unable to create a GPUProgram for builtin program: %u\n", program);
return retval; return retval;
} }

2
source/blender/imbuf/intern/cineon/cineonlib.c
View File

@@ -307,7 +307,7 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t
printf(" Transfer characteristics: %d\n", cineon->element[i].transfer); printf(" Transfer characteristics: %d\n", cineon->element[i].transfer);
printf(" Packing: %d\n", cineon->element[i].packing); printf(" Packing: %d\n", cineon->element[i].packing);
printf(" Descriptor: %d\n", cineon->element[i].descriptor); printf(" Descriptor: %d\n", cineon->element[i].descriptor);
printf(" Data offset: %u\n", cineon->element[i].dataOffset); printf(" Data offset: %d\n", cineon->element[i].dataOffset);
printf(" Reference low data: %u\n", cineon->element[i].refLowData); printf(" Reference low data: %u\n", cineon->element[i].refLowData);
printf(" Reference low quantity: %f\n", cineon->element[i].refLowQuantity); printf(" Reference low quantity: %f\n", cineon->element[i].refLowQuantity);
printf(" Reference high data: %u\n", cineon->element[i].refHighData); printf(" Reference high data: %u\n", cineon->element[i].refHighData);

2
source/blender/imbuf/intern/cineon/dpxlib.c
View File

@@ -366,7 +366,7 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf
printf(" Transfer characteristics: %d\n", dpx->element[i].transfer); printf(" Transfer characteristics: %d\n", dpx->element[i].transfer);
printf(" Packing: %d\n", dpx->element[i].packing); printf(" Packing: %d\n", dpx->element[i].packing);
printf(" Descriptor: %d\n", dpx->element[i].descriptor); printf(" Descriptor: %d\n", dpx->element[i].descriptor);
printf(" Data offset: %u\n", dpx->element[i].dataOffset); printf(" Data offset: %d\n", dpx->element[i].dataOffset);
printf(" Reference low data: %u\n", dpx->element[i].refLowData); printf(" Reference low data: %u\n", dpx->element[i].refLowData);
printf(" Reference low quantity: %f\n", dpx->element[i].refLowQuantity); printf(" Reference low quantity: %f\n", dpx->element[i].refLowQuantity);
printf(" Reference high data: %u\n", dpx->element[i].refHighData); printf(" Reference high data: %u\n", dpx->element[i].refHighData);

2
source/blender/imbuf/intern/cineon/logImageCore.c
View File

@@ -623,7 +623,7 @@ static int logImageElementGetData8(LogImageFile *logImage, LogImageElement logEl
for (y = 0; y < logImage->height; y++) { for (y = 0; y < logImage->height; y++) {
/* 8 bits are 32-bits padded so we need to seek at each row */ /* 8 bits are 32-bits padded so we need to seek at each row */
if (logimage_fseek(logImage, logElement.dataOffset + y * rowLength, SEEK_SET) != 0) { if (logimage_fseek(logImage, logElement.dataOffset + y * rowLength, SEEK_SET) != 0) {
if (verbose) printf("DPX/Cineon: Couldn't seek at %d\n", logElement.dataOffset + y * rowLength); if (verbose) printf("DPX/Cineon: Couldn't seek at %d\n", logElement.dataOffset + y * (int)rowLength);
return 1; return 1;
} }

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -578,7 +578,7 @@ void WM_event_print(const wmEvent *event)
if (ISNDOF(event->type)) { if (ISNDOF(event->type)) {
const wmNDOFMotionData *ndof = event->customdata; const wmNDOFMotionData *ndof = event->customdata;
if (event->type == NDOF_MOTION) { if (event->type == NDOF_MOTION) {
printf(" ndof: rot: (%.4f %.4f %.4f), tx: (%.4f %.4f %.4f), dt: %.4f, progress: %d\n", printf(" ndof: rot: (%.4f %.4f %.4f), tx: (%.4f %.4f %.4f), dt: %.4f, progress: %u\n",
UNPACK3(ndof->rvec), UNPACK3(ndof->tvec), ndof->dt, ndof->progress); UNPACK3(ndof->rvec), UNPACK3(ndof->tvec), ndof->dt, ndof->progress);
} }
else { else {

2
source/blender/windowmanager/intern/wm_init_exit.c
View File

@@ -550,7 +550,7 @@ void WM_exit_ext(bContext *C, const bool do_python)
if (MEM_get_memory_blocks_in_use() != 0) { if (MEM_get_memory_blocks_in_use() != 0) {
size_t mem_in_use = MEM_get_memory_in_use() + MEM_get_memory_in_use(); size_t mem_in_use = MEM_get_memory_in_use() + MEM_get_memory_in_use();
printf("Error: Not freed memory blocks: %d, total unfreed memory %f MB\n", printf("Error: Not freed memory blocks: %u, total unfreed memory %f MB\n",
MEM_get_memory_blocks_in_use(), MEM_get_memory_blocks_in_use(),
(double)mem_in_use / 1024 / 1024); (double)mem_in_use / 1024 / 1024);
MEM_printmemlist(); MEM_printmemlist();