From e7861fd8464d1bbd76259ea3dd1d6505c8c031da Mon Sep 17 00:00:00 2001 From: neil Date: Sun, 14 Jun 2015 01:49:31 +0000 Subject: [PATCH] Removed extraneous code from ACTION_FORMAT that prevented unformatted devices from being formatted (too much was copied from ACTION_RENAME_DISK). git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50818 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/filesys/fat/packet.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/rom/filesys/fat/packet.c b/rom/filesys/fat/packet.c index 0585ece786..41a1ea7746 100644 --- a/rom/filesys/fat/packet.c +++ b/rom/filesys/fat/packet.c @@ -561,8 +561,8 @@ void ProcessPackets(struct Globals *glob) { RawPutChars(AROS_BSTR_ADDR(pkt->dp_Arg1), AROS_BSTR_strlen(pkt->dp_Arg1)); bug("'\n")); - if (glob->sb && glob->sb->doslist == NULL) { - err = glob->disk_inserted ? ERROR_NOT_A_DOS_DISK : ERROR_NO_DISK; + if (!glob->disk_inserted) { + err = ERROR_NO_DISK; break; } @@ -571,18 +571,6 @@ void ProcessPackets(struct Globals *glob) { if (err != 0) break; - if (glob->sb) { -#ifdef AROS_FAST_BPTR - /* ReadFATSuper() sets a null byte after the - * string, so this should be fine */ - CopyMem(glob->sb->volume.name + 1, glob->sb->doslist->dol_Name, - glob->sb->volume.name[0] + 1); -#else - CopyMem(glob->sb->volume.name, BADDR(glob->sb->doslist->dol_Name), - glob->sb->volume.name[0] + 2); -#endif - } - SendEvent(IECLASS_DISKINSERTED, glob); res = DOSTRUE; -- 2.11.4.GIT