From 4615bfefd1d4dc0b3a137209f4a027c528732d69 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 27 Dec 2015 16:26:51 -0800 Subject: [PATCH] explicit casts --- main/bmread.c | 2 +- main/dumpmine.c | 2 +- main/editor/group.c | 10 +++++----- main/editor/macro.c | 2 +- main/editor/med.c | 4 ++-- main/editor/medmisc.c | 4 ++-- main/editor/mine.c | 2 +- main/editor/seguvs.c | 2 +- main/editor/texpage.c | 2 +- main/gamesave.c | 30 +++++++++++++++--------------- main/multi.c | 2 +- main/piggy.c | 10 +++++----- ui/button.c | 2 +- ui/checkbox.c | 2 +- ui/file.c | 6 +++--- ui/icon.c | 2 +- ui/inputbox.c | 2 +- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/main/bmread.c b/main/bmread.c index a5ba8d4d..81b7debc 100644 --- a/main/bmread.c +++ b/main/bmread.c @@ -473,7 +473,7 @@ int bm_init_use_tbl() if (have_bin_tbl) { // is this a binary tbl file decode_text_line (inputline); } else { - while (inputline[(l=strlen(inputline))-2]=='\\') { + while (inputline[(l = (int)strlen(inputline)) - 2] == '\\') { if (!isspace(inputline[l-3])) { //if not space before backslash... inputline[l-2] = ' '; //add one l++; diff --git a/main/dumpmine.c b/main/dumpmine.c index 9f7cdd07..2032cf0c 100644 --- a/main/dumpmine.c +++ b/main/dumpmine.c @@ -532,7 +532,7 @@ void write_game_text_file(char *filename) // mprintf((0, "Writing text file for mine [%s]\n", filename)); - namelen = strlen(filename); + namelen = (int)strlen(filename); Assert (namelen > 4); diff --git a/main/editor/group.c b/main/editor/group.c index dde0caf1..c642f7dc 100644 --- a/main/editor/group.c +++ b/main/editor/group.c @@ -1117,7 +1117,7 @@ int med_save_group( char *filename, short *vertex_ids, short *segment_ids, int n group_header.num_segments = num_segments; // Write the editor info - header_offset = ftell(SaveFile); + header_offset = (int)ftell(SaveFile); fwrite( &group_header, sizeof(group_header), 1, SaveFile ); //===================== SAVE EDITOR INFO ========================== @@ -1134,13 +1134,13 @@ int med_save_group( char *filename, short *vertex_ids, short *segment_ids, int n group_editor.Groupsegp = 0; group_editor.Groupside = Groupside[current_group]; - editor_offset = ftell(SaveFile); + editor_offset = (int)ftell(SaveFile); fwrite( &group_editor, sizeof(group_editor), 1, SaveFile ); //===================== SAVE VERTEX INFO ========================== - vertex_offset = ftell(SaveFile); + vertex_offset = (int)ftell(SaveFile); for (i=0;iverts[Side_to_verts[Curside][i]]]; g3_rotate_point(&corner_p[i],&corner_v[i]); - if (labs(corner_p[i].p3_x) > max) max = labs(corner_p[i].p3_x); - if (labs(corner_p[i].p3_y) > max) max = labs(corner_p[i].p3_y); + if ((fix)labs(corner_p[i].p3_x) > max) max = (fix)labs(corner_p[i].p3_x); + if ((fix)labs(corner_p[i].p3_y) > max) max = (fix)labs(corner_p[i].p3_y); } view_dist = fixmul(view_dist,fixdiv(fixdiv(max,SIDE_VIEW_FRAC),corner_p[0].p3_z)); diff --git a/main/editor/medmisc.c b/main/editor/medmisc.c index 1747b879..386947fc 100644 --- a/main/editor/medmisc.c +++ b/main/editor/medmisc.c @@ -74,9 +74,9 @@ void GetMouseRotation( int idx, int idy, vms_matrix * RotMat ) dx = i2f(idx); dy = i2f(idy); - dr = dist_2d(dx,dy); + dr = (fix)dist_2d(dx, dy); - denom = dist_2d(Radius,dr); + denom = (fix)dist_2d(Radius, dr); cos_theta = fixdiv(Radius,denom); sin_theta = fixdiv(dr,denom); diff --git a/main/editor/mine.c b/main/editor/mine.c index 956a4a49..c556e54e 100644 --- a/main/editor/mine.c +++ b/main/editor/mine.c @@ -361,7 +361,7 @@ int save_mine_data(CFILE * SaveFile) //=================== Calculate offsets into file ================== - header_offset = cftell(SaveFile) + sizeof(mine_fileinfo); + header_offset = (int)(cftell(SaveFile) + sizeof(mine_fileinfo)); editor_offset = header_offset + sizeof(mine_header); texture_offset = editor_offset + sizeof(mine_editor); vertex_offset = texture_offset + (13*NumTextures); diff --git a/main/editor/seguvs.c b/main/editor/seguvs.c index 1bfdcdf7..75877ab2 100644 --- a/main/editor/seguvs.c +++ b/main/editor/seguvs.c @@ -503,7 +503,7 @@ fix zhypot(fix a,fix b); fix zhypot(fix a,fix b) { double x = (double)a / 65536; double y = (double)b / 65536; - return (long)(sqrt(x * x + y * y) * 65536); + return (fix)((long)(sqrt(x * x + y * y) * 65536)); } #endif diff --git a/main/editor/texpage.c b/main/editor/texpage.c index a1f4a3be..b4eb2e78 100644 --- a/main/editor/texpage.c +++ b/main/editor/texpage.c @@ -56,7 +56,7 @@ static void texpage_print_name( char name[13] ) int w,h,aw; int i; - for (i=strlen(name);i<12;i++) + for (i = (int)strlen(name); i < 12; i++) name[i]=' '; name[i]=0; diff --git a/main/gamesave.c b/main/gamesave.c index 0f1ffead..95ef9af9 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -128,7 +128,7 @@ int Gamesave_num_org_robots = 0; // Note that a pathspec can appear at the beginning of the filename. int is_real_level(char *filename) { - int len = strlen(filename); + int len = (int)strlen(filename); if (len < 6) return 0; @@ -1465,7 +1465,7 @@ int save_game_data(PHYSFS_file *SaveFile) PHYSFS_writeSLE32(SaveFile, sizeof(game_fileinfo)); PHYSFS_write(SaveFile, Current_level_name, 15, 1); PHYSFS_writeSLE32(SaveFile, Current_level_num); - offset_offset = PHYSFS_tell(SaveFile); // write the offsets later + offset_offset = (int)PHYSFS_tell(SaveFile); // write the offsets later PHYSFS_writeSLE32(SaveFile, -1); PHYSFS_writeSLE32(SaveFile, sizeof(player)); @@ -1499,12 +1499,12 @@ int save_game_data(PHYSFS_file *SaveFile) //==================== SAVE PLAYER INFO =========================== - player_offset = PHYSFS_tell(SaveFile); - PHYSFS_write(SaveFile, &Players[Player_num], sizeof(player), 1); // not endian friendly, but not used either + player_offset = (int)PHYSFS_tell(SaveFile); + PHYSFS_write(SaveFile, &Players[Player_num], sizeof(player), 1); // not endian friendly, but not used either //==================== SAVE OBJECT INFO =========================== - object_offset = PHYSFS_tell(SaveFile); + object_offset = (int)PHYSFS_tell(SaveFile); //fwrite( &Objects, sizeof(object), game_fileinfo.object_howmany, SaveFile ); { for (i = 0; i <= Highest_object_index; i++) @@ -1513,7 +1513,7 @@ int save_game_data(PHYSFS_file *SaveFile) //==================== SAVE WALL INFO ============================= - walls_offset = PHYSFS_tell(SaveFile); + walls_offset = (int)PHYSFS_tell(SaveFile); for (i = 0; i < Num_walls; i++) wall_write(&Walls[i], game_top_fileinfo_version, SaveFile); @@ -1529,19 +1529,19 @@ int save_game_data(PHYSFS_file *SaveFile) //==================== SAVE TRIGGER INFO ============================= - triggers_offset = PHYSFS_tell(SaveFile); + triggers_offset = (int)PHYSFS_tell(SaveFile); for (i = 0; i < Num_triggers; i++) trigger_write(&Triggers[i], game_top_fileinfo_version, SaveFile); //================ SAVE CONTROL CENTER TRIGGER INFO =============== - control_offset = PHYSFS_tell(SaveFile); + control_offset = (int)PHYSFS_tell(SaveFile); control_center_triggers_write(&ControlCenterTriggers, SaveFile); //================ SAVE MATERIALIZATION CENTER TRIGGER INFO =============== - matcen_offset = PHYSFS_tell(SaveFile); + matcen_offset = (int)PHYSFS_tell(SaveFile); // mprintf((0, "Writing %i materialization centers\n", game_fileinfo.matcen_howmany)); // { int i; // for (i=0; i= 29) { - dl_indices_offset = PHYSFS_tell(SaveFile); + dl_indices_offset = (int)PHYSFS_tell(SaveFile); for (i = 0; i < Num_static_lights; i++) dl_index_write(&Dl_indices[i], SaveFile); - delta_light_offset = PHYSFS_tell(SaveFile); + delta_light_offset = (int)PHYSFS_tell(SaveFile); for (i = 0; i < num_delta_lights; i++) delta_light_write(&Delta_lights[i], SaveFile); } //============= SAVE OFFSETS =============== - end_offset = PHYSFS_tell(SaveFile); + end_offset = (int)PHYSFS_tell(SaveFile); // Update the offset fields @@ -1711,14 +1711,14 @@ int save_level_sub(char * filename, int compiled_version) PHYSFSX_writeVector(SaveFile, &Secret_return_orient.uvec); } - minedata_offset = PHYSFS_tell(SaveFile); + minedata_offset = (int)PHYSFS_tell(SaveFile); #if 0 // only save compiled mine data if ( !compiled_version ) save_mine_data(SaveFile); else #endif save_mine_data_compiled(SaveFile); - gamedata_offset = PHYSFS_tell(SaveFile); + gamedata_offset = (int)PHYSFS_tell(SaveFile); save_game_data(SaveFile); PHYSFS_seek(SaveFile, sizeof(int) + sizeof(Gamesave_current_version)); @@ -1726,7 +1726,7 @@ int save_level_sub(char * filename, int compiled_version) PHYSFS_writeSLE32(SaveFile, gamedata_offset); if (Gamesave_current_version < 5) - PHYSFS_writeSLE32(SaveFile, PHYSFS_fileLength(SaveFile)); + PHYSFS_writeSLE32(SaveFile, (PHYSFS_sint32)PHYSFS_fileLength(SaveFile)); //==================== CLOSE THE FILE ============================= PHYSFS_close(SaveFile); diff --git a/main/multi.c b/main/multi.c index 07a5e280..488df236 100644 --- a/main/multi.c +++ b/main/multi.c @@ -5221,7 +5221,7 @@ void save_hoard_data(void) ifile = PHYSFS_openRead(sounds[i]); Assert(ifile != NULL); - size = PHYSFS_fileLength(ifile); + size = (int)PHYSFS_fileLength(ifile); buf = d_malloc(size); PHYSFS_read(ifile, buf, size, 1); PHYSFS_writeULE32(ofile, size); diff --git a/main/piggy.c b/main/piggy.c index b8bb4474..37610954 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -1293,7 +1293,7 @@ void piggy_write_pigfile(char *filename) fwrite( &Num_bitmap_files, sizeof(int), 1, pig_fp ); Num_bitmap_files++; - bitmap_data_start = ftell(pig_fp); + bitmap_data_start = (int)ftell(pig_fp); bitmap_data_start += (Num_bitmap_files - 1) * sizeof(DiskBitmapHeader); data_offset = bitmap_data_start; @@ -1333,7 +1333,7 @@ void piggy_write_pigfile(char *filename) if (fp1) fprintf( fp1, "BMP: %s, size %d bytes", AllBitmaps[i].name, bmp->bm_rowsize * bmp->bm_h ); - org_offset = ftell(pig_fp); + org_offset = (int)ftell(pig_fp); bmh.offset = data_offset - bitmap_data_start; fseek( pig_fp, data_offset, SEEK_SET ); @@ -1419,7 +1419,7 @@ void piggy_dump_all() write_int(HAMFILE_VERSION,ham_fp); bm_write_all(ham_fp); - xlat_offset = ftell(ham_fp); + xlat_offset = (int)ftell(ham_fp); fwrite( GameBitmapXlat, sizeof(ushort)*MAX_BITMAP_FILES, 1, ham_fp ); //Dump bitmaps @@ -1452,7 +1452,7 @@ void piggy_dump_all() mprintf( (0, "\nDumping sounds..." )); - sound_data_start = ftell(ham_fp); + sound_data_start = (int)ftell(ham_fp); sound_data_start += Num_sound_files*sizeof(DiskSoundHeader); data_offset = sound_data_start; @@ -1464,7 +1464,7 @@ void piggy_dump_all() sndh.length = GameSounds[i].length; sndh.offset = data_offset - sound_data_start; - org_offset = ftell(ham_fp); + org_offset = (int)ftell(ham_fp); fseek( ham_fp, data_offset, SEEK_SET ); sndh.data_length = GameSounds[i].length; diff --git a/ui/button.c b/ui/button.c index d45e5fcb..9cf74ea0 100644 --- a/ui/button.c +++ b/ui/button.c @@ -106,7 +106,7 @@ UI_GADGET_BUTTON * ui_add_gadget_button( UI_WINDOW * wnd, short x, short y, shor if ( text ) { - MALLOC( button->text, char, strlen(text)+1 ); + MALLOC( button->text, char, (int)strlen(text)+1 ); strcpy( button->text, text ); } else { button->text = NULL; diff --git a/ui/checkbox.c b/ui/checkbox.c index 340ef42a..b7703b64 100644 --- a/ui/checkbox.c +++ b/ui/checkbox.c @@ -70,7 +70,7 @@ UI_GADGET_CHECKBOX * ui_add_gadget_checkbox( UI_WINDOW * wnd, short x, short y, checkbox = (UI_GADGET_CHECKBOX *)ui_gadget_add( wnd, 5, x, y, x+w-1, y+h-1 ); - checkbox->text = d_malloc(strlen(text) + 5); + checkbox->text = d_malloc((int)strlen(text) + 5); strcpy(checkbox->text,text); checkbox->width = w; checkbox->height = h; diff --git a/ui/file.c b/ui/file.c index 6f7adc17..f29203a2 100644 --- a/ui/file.c +++ b/ui/file.c @@ -51,7 +51,7 @@ char **file_getdirlist(int *NumDirs, char *dir) strncat(path, "/", PATH_MAX - strlen(dir)); test_filename = path + strlen(path); - test_max = PATH_MAX - (test_filename - path); + test_max = (int)(PATH_MAX - (test_filename - path)); for (i = list; *i; i++) { @@ -66,7 +66,7 @@ char **file_getdirlist(int *NumDirs, char *dir) } *j = NULL; - *NumDirs = j - list; + *NumDirs = (int)(j - list); qsort(list, *NumDirs, sizeof(char *), (int (*)( const void *, const void * ))file_sort_func); if (*dir) @@ -105,7 +105,7 @@ char **file_getfilelist(int *NumFiles, char *filespec, char *dir) *j = NULL; - *NumFiles = j - list; + *NumFiles = (int)(j - list); qsort(list, *NumFiles, sizeof(char *), (int (*)( const void *, const void * ))file_sort_func); return list; diff --git a/ui/icon.c b/ui/icon.c index e16274d7..e4ad59a6 100644 --- a/ui/icon.c +++ b/ui/icon.c @@ -90,7 +90,7 @@ UI_GADGET_ICON * ui_add_gadget_icon( UI_WINDOW * wnd, char * text, short x, shor icon->width = w; icon->height = h; - MALLOC( icon->text, char, strlen( text )+2); + MALLOC( icon->text, char, (int)strlen( text )+2); strcpy( icon->text, text ); icon->trap_key = k; icon->user_function = f; diff --git a/ui/inputbox.c b/ui/inputbox.c index 53a659bc..9d03fe95 100644 --- a/ui/inputbox.c +++ b/ui/inputbox.c @@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. void strcins(char *s, int p, char c) { int n; - for (n=strlen(s)-p; n>=0; n-- ) + for (n = (int)strlen(s) - p; n >= 0; n--) *(s+p+n+1) = *(s+p+n); // Move everything over *(s+p) = c; // then insert the character } -- 2.39.2