Merge pull request #32 from dholm/code-fixes

Minor code fixes

DiskImage.cpp

@@ -1394,7 +1394,7 @@ void TDiskImage::readFDI(int hfile, bool readonly)
 		{
 			if (rsize < fdiOFF)
 			{
-				delete tracksinfo;
+				delete[] tracksinfo;
 				delete ptr;
 				ShowError(ERR_CORRUPT);
 				return;
@@ -1405,7 +1405,7 @@ void TDiskImage::readFDI(int hfile, bool readonly)
 
 			if (rsize < fdiOFFdata + tracksinfo[trk*(MaxSide + 1) + side].DataOffset)
 			{
-				delete tracksinfo;
+				delete[] tracksinfo;
 				delete ptr;
 				ShowError(ERR_CORRUPT);
 				return;
@@ -1424,7 +1424,7 @@ void TDiskImage::readFDI(int hfile, bool readonly)
 
 				if (rsize < fdiOFFdata + tracksinfo[trk*(MaxSide + 1) + side].DataOffset + tracksinfo[trk*(MaxSide + 1) + side].SectorsInfo[isec].SectorOffset)
 				{
-					delete tracksinfo;
+					delete[] tracksinfo;
 					delete ptr;
 					ShowError(ERR_CORRUPT);
 					return;
@@ -1475,7 +1475,7 @@ void TDiskImage::readFDI(int hfile, bool readonly)
 
 			if (trkdatalen + SecCount*(3 + 2) > 6250)    // 3x4E & 2x00 per sec checking
 			{
-				delete tracksinfo;
+				delete[] tracksinfo;
 				delete ptr;
 				for (int t = 0; t < 256; t++)
 					for (int s = 0; s < 256; s++)
@@ -1640,7 +1640,7 @@ void TDiskImage::readFDI(int hfile, bool readonly)
 			}
 		}
 
-	delete tracksinfo;
+	delete[] tracksinfo;
 	delete ptr;
 	ReadOnly = readonly;
 	FType = DIT_FDI;

fpga_io.cpp

@@ -486,7 +486,7 @@ int fpga_load_rbf(const char *name, const char *cfg)
 			{
 				if (read(rbf, buf, st.st_size)<st.st_size)
 				{
-					printf("Couldn't read file \n", st.st_size);
+					printf("Couldn't read file %s\n", name);
 					ret = -1;
 				}
 				else

input.cpp

@@ -475,7 +475,7 @@ static const int ev2ps2[] =
 	NONE, //191 KEY_F21			
 	NONE, //192 KEY_F22			
 	NONE, //193 KEY_F23			
-	0x5D, //194 U-mlaut on DE mapped to \
+	0x5D, //194 U-mlaut on DE mapped to
 	NONE, //195 ???				
 	NONE, //196 ???				
 	NONE, //197 ???				

menu.cpp

@@ -678,12 +678,12 @@ void HandleUI(void)
 		return;
 	}
 	
-	struct RigidDiskBlock *rdb;
+	struct RigidDiskBlock *rdb = nullptr;
 
 	static char opensave;
 	char *p;
 	char s[40];
-	unsigned char m, up, down, select, menu, right, left, plus, minus;
+	unsigned char m = 0, up, down, select, menu, right, left, plus, minus;
 	uint8_t mod;
 	unsigned long len;
 	char enable;

support/minimig/minimig_config.cpp

@@ -245,7 +245,7 @@ static char* GetConfigurationName(int num)
 	if (d)
 	{
 		if(num) sprintf(path, "minimig%d", num);
-		else sprintf(path, "minimig.cfg", num);
+		else sprintf(path, "minimig.cfg");
 
 		while ((dir = readdir(d)) != NULL)
 		{

support/sharpmz/sharpmz.cpp

@@ -1967,13 +1967,13 @@ int sharpmz_default_ui_state(void)
 // code base and to limit common code case size.
 // The same general programming structure is maintained to enable easier changes.
 //
-int sharpmz_ui(int idleState,              int idle2State,              int systemState,              int selectFile,
-               unsigned char *parentstate, unsigned char *menustate,    unsigned char *menusub,       unsigned char *menusub_last,
-               unsigned int  *menumask,    char          *selectedPath, const char    **helptext,     char          *helptext_custom,
-               unsigned char *fs_ExtLen,   unsigned char *fs_Options,   unsigned char *fs_MenuSelect, unsigned char *fs_MenuCancel,
-               char          *fs_pFileExt,
-               unsigned char menu,         unsigned char select,        unsigned char up,             unsigned char down,
-               unsigned char left,         unsigned char right,         unsigned char plus,           unsigned char minus)
+void sharpmz_ui(int idleState,             int idle2State,              int systemState,              int selectFile,
+                unsigned char *parentstate, unsigned char *menustate,    unsigned char *menusub,       unsigned char *menusub_last,
+                unsigned int  *menumask,    char          *selectedPath, const char    **helptext,     char          *helptext_custom,
+                unsigned char *fs_ExtLen,   unsigned char *fs_Options,   unsigned char *fs_MenuSelect, unsigned char *fs_MenuCancel,
+                char          *fs_pFileExt,
+                unsigned char menu,         unsigned char select,        unsigned char up,             unsigned char down,
+                unsigned char left,         unsigned char right,         unsigned char plus,           unsigned char minus)
 {
     // Locals - original variables are generally all lower case, variables specific to this method are capitalised on change of word.
     //

support/sharpmz/sharpmz.h

@@ -459,7 +459,7 @@ char                  *sharpmz_get_next_filename(char);
 void                   sharpmz_clear_filelist(void);
 void                   sharpmz_select_file(const char*, unsigned char, char *, char, char *);
 int                    sharpmz_default_ui_state(void);
-int                    sharpmz_ui(int, int, int, int,
+void                   sharpmz_ui(int, int, int, int,
                                   unsigned char *, unsigned char *, unsigned char *, unsigned char *,
                                   unsigned int *,  char *,          const char **,   char *, 
                                   unsigned char *, unsigned char *, unsigned char *, unsigned char *,

user_io.cpp

@@ -2564,7 +2564,7 @@ unsigned char user_io_ext_idx(char *name, char* ext)
 		}
 	}
 
-	printf("not found! use 0\n", name, ext, 0);
+	printf("not found! use 0\n");
 	return 0;
 }