ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/ether_unix.cpp

Comparing BasiliskII/src/Unix/ether_unix.cpp (file contents):
Revision 1.32 by asvitkine, 2011-12-28T20:22:25Z vs.
Revision 1.34 by asvitkine, 2012-04-01T15:05:55Z

#	Line 225 | Line 225 | static bool execute_network_script(const
225
226		bool ether_init(void)
227		{
228	<	int val, nonblock = 1;
228	>	int val;
229		char str[256];
230
231		// Do nothing if no Ethernet device specified
#	Line 262 | Line 262 | bool ether_init(void)
262		// Initialize slirp library
263		if (net_if_type == NET_IF_SLIRP) {
264		if (slirp_init() < 0) {
265	<	sprintf(str, GetString(STR_SLIRP_NO_DNS_FOUND_WARN));
265	>	sprintf(str, "%s", GetString(STR_SLIRP_NO_DNS_FOUND_WARN));
266		WarningAlert(str);
267		return false;
268		}
#	Line 347 | Line 347 | bool ether_init(void)
347
348		// Set nonblocking I/O
349		#ifdef USE_FIONBIO
350	+	int nonblock = 1;
351		if (ioctl(fd, FIONBIO, &nonblock) < 0) {
352		sprintf(str, GetString(STR_BLOCKING_NET_SOCKET_WARN), strerror(errno));
353		WarningAlert(str);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines