From 49fe397b0d4d175c1a8bcfdad85a05660b029596 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Mon, 12 Nov 2012 18:32:27 +0000 Subject: [PATCH] Fix some 64 bit warnings Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3800 --- src/shell/shell_cmds.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp index 1e42d103..ab23be37 100644 --- a/src/shell/shell_cmds.cpp +++ b/src/shell/shell_cmds.cpp @@ -369,8 +369,8 @@ void DOS_Shell::CMD_RMDIR(char * args) { } } -static void FormatNumber(Bitu num,char * buf) { - Bitu numm,numk,numb,numg; +static void FormatNumber(Bit32u num,char * buf) { + Bit32u numm,numk,numb,numg; numb=num % 1000; num/=1000; numk=num % 1000; @@ -960,7 +960,7 @@ void DOS_Shell::CMD_DATE(char * args) { return; } // check if a date was passed in command line - Bitu newday,newmonth,newyear; + Bit32u newday,newmonth,newyear; if(sscanf(args,"%u-%u-%u",&newmonth,&newday,&newyear)==3) { reg_cx = newyear; reg_dh = newmonth; @@ -976,7 +976,7 @@ void DOS_Shell::CMD_DATE(char * args) { CALLBACK_RunRealInt(0x21); const char* datestring = MSG_Get("SHELL_CMD_DATE_DAYS"); - Bit8u length; + Bit32u length; char day[6] = {0}; if(sscanf(datestring,"%u",&length) && (length<5) && (strlen(datestring)==(length*7+1))) { // date string appears valid @@ -994,9 +994,9 @@ void DOS_Shell::CMD_DATE(char * args) { buffer[bufferptr] = formatstring[i]; bufferptr++; } else { - if(formatstring[i]=='M') bufferptr += sprintf(buffer+bufferptr,"%02u",(Bitu)reg_dh); - if(formatstring[i]=='D') bufferptr += sprintf(buffer+bufferptr,"%02u",(Bitu)reg_dl); - if(formatstring[i]=='Y') bufferptr += sprintf(buffer+bufferptr,"%04u",(Bitu)reg_cx); + if(formatstring[i]=='M') bufferptr += sprintf(buffer+bufferptr,"%02u",(Bit8u) reg_dh); + if(formatstring[i]=='D') bufferptr += sprintf(buffer+bufferptr,"%02u",(Bit8u) reg_dl); + if(formatstring[i]=='Y') bufferptr += sprintf(buffer+bufferptr,"%04u",(Bit16u) reg_cx); } } WriteOut("%s %s\n",day, buffer);