02.06.2010

src/cfgfile.c

@@ -2679,7 +2679,7 @@ int parse_cmdline_option (struct uae_prefs *p, char c, char *arg)
     case 'r': strncpy (p->romfile, arg, 255); p->romfile[255] = 0; break;
     case 'K': strncpy (p->keyfile, arg, 255); p->keyfile[255] = 0; break;
     case 'p': strncpy (p->prtname, arg, 255); p->prtname[255] = 0; break;
-	/*     case 'I': strncpy (p->sername, arg, 255); p->sername[255] = 0; currprefs.use_serial = 1; break; */
+    case 'I': strncpy (p->sername, arg, 255); p->sername[255] = 0; currprefs.use_serial = 1; break;
     case 'm': case 'M': parse_filesys_spec (c == 'M', arg); break;
     case 'W': parse_hardfile_spec (arg); break;
 	case 'S': parse_sound_spec (p, arg); break;

src/disk.c

@@ -3086,6 +3086,7 @@ void DSKLEN (uae_u16 v, unsigned int hpos)
 	int motormask;
 
 	DISK_update (hpos);
+
 	if ((v & 0x8000) && (dsklen & 0x8000)) {
 		dskdmaen = 2;
 		DISK_start ();

src/filesys.c

@@ -2897,7 +2897,7 @@ static void
 	put_long (info + 120, entrytype);
 
 	TRACE(("name=\"%s\"\n", xs));
-	x2 = x = ua_fs (xs, -1);
+	x = ua_fs (xs, -1);
 	n = strlen (x);
 	if (n > 106)
 		n = 106;
@@ -2907,7 +2907,6 @@ static void
 		put_byte (info + i, *x), i++, x++;
 	while (i < 108)
 		put_byte (info + i, 0), i++;
-	xfree (x2);
 
 #if defined TARGET_AMIGAOS && defined WORDS_BIGENDIAN
 	 BPTR lock;
@@ -2943,7 +2942,7 @@ static void
 		xs = aino->comment;
 		if (!xs)
 			xs= "";
-		x2 = x = ua_fs (xs, -1);
+		x = ua_fs (xs, -1);
 		n = strlen (x);
 		if (n > 78)
 			n = 78;
@@ -2952,7 +2951,6 @@ static void
 			put_byte (info + i, *x), i++, x++;
 		while (i < 224)
 			put_byte (info + i, 0), i++;
-		xfree (x2);
 	}
 	PUT_PCK_RES1 (packet, DOS_TRUE);
 }

src/fsusage.c

@@ -198,7 +198,11 @@ int get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
    Return the actual number of bytes read, zero for EOF, or negative
    for an error.  */
 
-static int safe_read (int desc, char *ptr, int len)
+static int
+	safe_read (desc, ptr, len)
+	int desc;
+	char *ptr;
+	int len;
 {
 	int n_chars;
 
@@ -226,7 +230,7 @@ static int safe_read (int desc, char *ptr, int len)
    ERRNO is either a system error value, or zero if DISK is NULL
    on a system that requires a non-NULL value.  */
 int
-get_fs_usage (path, disk, fsp)
+	get_fs_usage (path, disk, fsp)
 	const char *path;
 	const char *disk;
      struct fs_usage *fsp;
@@ -380,7 +384,7 @@ get_fs_usage (path, disk, fsp)
 /* AIX PS/2 does not supply statfs.  */
 
 int
-statfs (path, fsb)
+	statfs (path, fsb)
 	char *path;
 	struct statfs *fsb;
 {

src/tools/config.log

@@ -445,7 +445,7 @@ configure:4344: $? = 0
 configure:4344: result: yes
 configure:4350: checking for _doprnt
 configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccvIP0rc.o: In function `main':
+/tmp/ccQVX6ss.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:4350: $? = 1
@@ -533,7 +533,7 @@ configure:4364: $? = 0
 configure:4364: result: yes
 configure:4364: checking for strcmpi
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccrvPcpr.o: In function `main':
+/tmp/ccML3BqH.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1
@@ -613,7 +613,7 @@ configure: failed program was:
 configure:4364: result: no
 configure:4364: checking for stricmp
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccc5rzSv.o: In function `main':
+/tmp/ccLZtbQE.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1