--- np2/fdd/fdd_d88.c 2003/10/16 17:58:29 1.1.1.1 +++ np2/fdd/fdd_d88.c 2003/10/18 01:21:58 1.3 @@ -28,13 +28,13 @@ static UINT32 nexttrackptr(FDDFILE fdd, // ---- typedef struct { - FDDFILE fdd; - UINT track; - BYTE type; - long fptr; - UINT size; - BOOL write; - BYTE buf[D88BUFSIZE]; + FDDFILE fdd; + UINT track; + BYTE type; + long fptr; + UINT size; + BOOL write; + BYTE buf[D88BUFSIZE]; } _D88TRK, *D88TRK; static _D88TRK d88trk; @@ -177,7 +177,7 @@ static BOOL rpmcheck(D88SEC sec) { return(SUCCESS); } - +#if 0 static D88SEC d88trk_seasector(BOOL check) { D88TRK trk; @@ -218,6 +218,7 @@ static D88SEC d88trk_seasector(BOOL chec } return(NULL); } +#endif // ---- @@ -324,7 +325,7 @@ BOOL fddd88_set(FDDFILE fdd, const char goto fdst_err; } fdd->type = DISKTYPE_D88; - milstr_ncpy(fdd->fname, fname, sizeof(fdd->fname)); + file_cpyname(fdd->fname, fname, sizeof(fdd->fname)); fdd->protect = ((attr & 1) || (fdd->inf.d88.head.protect & 0x10) || (ro))?TRUE:FALSE; fdd->inf.d88.fdtype_major = fdd->inf.d88.head.fd_type >> 4; @@ -599,7 +600,7 @@ static int fileappend(FILEH hdl, FDDFILE return(0); } while(length) { - if (length >= sizeof(tmp)) { + if (length >= (long)(sizeof(tmp))) { size = sizeof(tmp); } else {