vc2005.net beta proof
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2182
This commit is contained in:
parent
30193f5eed
commit
7e03ec1599
2 changed files with 4 additions and 4 deletions
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: dos_ioctl.cpp,v 1.24 2005-04-11 17:56:27 qbix79 Exp $ */
|
||||
/* $Id: dos_ioctl.cpp,v 1.25 2005-04-21 18:42:10 qbix79 Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include "dosbox.h"
|
||||
|
@ -104,7 +104,7 @@ bool DOS_IOCTL(void) {
|
|||
char const* bufin=Drives[drive]->GetLabel();
|
||||
char buffer[11] ={' '};
|
||||
|
||||
char* find_ext=strchr(bufin,'.');
|
||||
char const* find_ext=strchr(bufin,'.');
|
||||
if (find_ext) {
|
||||
Bitu size=find_ext-bufin;if (size>8) size=8;
|
||||
memcpy(buffer,bufin,size);
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: drive_cache.cpp,v 1.42 2005-02-10 10:20:51 qbix79 Exp $ */
|
||||
/* $Id: drive_cache.cpp,v 1.43 2005-04-21 18:43:28 qbix79 Exp $ */
|
||||
|
||||
#include "drives.h"
|
||||
#include "dos_inc.h"
|
||||
|
@ -315,7 +315,7 @@ bool DOS_Drive_Cache::GetShortName(const char* fullname, char* shortname)
|
|||
|
||||
int DOS_Drive_Cache::CompareShortname(const char* compareName, const char* shortName)
|
||||
{
|
||||
char* cpos = strchr(shortName,'~');
|
||||
char const* cpos = strchr(shortName,'~');
|
||||
if (cpos) {
|
||||
/* the following code is replaced as it's not safe when char* is 64 bits */
|
||||
/* Bits compareCount1 = (int)cpos - (int)shortName;
|
||||
|
|
Loading…
Add table
Reference in a new issue