Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-07-03 10:29:40 +00:00
Code Issues Projects Releases Wiki Activity

fixed indentation

Browse Source
This commit is contained in:
cebix 2001-07-15 02:34:23 +00:00
parent 0cc4091041
commit 08cbd41f78
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BasiliskII/src/AmigaOS/ether_amiga.cpp
View File

@ -392,13 +392,12 @@ static __saveds void net_func(void)
ULONG dev_unit; ULONG dev_unit;
str = PrefsFindString("ether"); str = PrefsFindString("ether");
if (str) if (str) {
{
const char *FirstSlash = strchr(str, '/'); const char *FirstSlash = strchr(str, '/');
const char *LastSlash = strrchr(str, '/'); const char *LastSlash = strrchr(str, '/');
if (FirstSlash && FirstSlash && FirstSlash != LastSlash) if (FirstSlash && FirstSlash && FirstSlash != LastSlash) {
{
// Device name contains path, i.e. "Networks/xyzzy.device" // Device name contains path, i.e. "Networks/xyzzy.device"
const char *lp = str; const char *lp = str;
char *dp = dev_name; char *dp = dev_name;
@ -410,28 +409,22 @@ static __saveds void net_func(void)
if (strlen(dev_name) < 1) if (strlen(dev_name) < 1)
goto quit; goto quit;
if (1 != sscanf(LastSlash, "/%ld", &dev_unit)) if (sscanf(LastSlash, "/%ld", &dev_unit) != 1)
goto quit; goto quit;
} else {
// printf("dev=<%s> unit=%d\n", dev_name, dev_unit); if (sscanf(str, "%[^/]/%ld", dev_name, &dev_unit) != 2)
}
else
{
if (2 != sscanf(str, "%[^/]/%ld", dev_name, &dev_unit))
goto quit; goto quit;
}
} }
else } else
goto quit; goto quit;
// Open device // Open device
control_io->ios2_BufferManagement = buffer_tags; control_io->ios2_BufferManagement = buffer_tags;
od_error = OpenDevice((UBYTE *)dev_name, dev_unit, (struct IORequest *)control_io, 0); od_error = OpenDevice((UBYTE *)dev_name, dev_unit, (struct IORequest *)control_io, 0);
if (0 != od_error || control_io->ios2_Req.io_Device == 0) if (od_error != 0 || control_io->ios2_Req.io_Device == 0) {
{
printf("WARNING: OpenDevice(<%s>, unit=%d) returned error %d)\n", (UBYTE *)dev_name, dev_unit, od_error); printf("WARNING: OpenDevice(<%s>, unit=%d) returned error %d)\n", (UBYTE *)dev_name, dev_unit, od_error);
goto quit; goto quit;
} }
opened = true; opened = true;
// Is it Ethernet? // Is it Ethernet?