code clean-up : remove unused variables and various fixes.

git-svn-id: svn://svn.code.sf.net/p/hxcfloppyemu/code/HxCFloppyEmulator/HxCFloppyEmulator_software/trunk@1404 63fa2f70-6a9b-4bc4-b855-9c6a949b1d69

HxCFloppyEmulator_software/sources/gui/about_gui.cxx

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <stdarg.h> 
+#include <stdarg.h>
 #include <time.h>
 #include <stdint.h>
 
@@ -139,10 +139,10 @@ int stopAudioOut()
 		waveOutReset(shwd);
 		waveOutBreakLoop(shwd);
 		waveOutBreakLoop(shwd);
-  
+
 		waveOutUnprepareHeader(shwd,&pwhOut1,sizeof(WAVEHDR));
 		waveOutUnprepareHeader(shwd,&pwhOut2,sizeof(WAVEHDR));
-				
+
 		waveOutClose(shwd);
 		#endif
 	}
@@ -150,21 +150,21 @@ int stopAudioOut()
 	return 0;
 }
 
-static void tick(void *v) 
+static void tick(void *v)
 {
 	About_box *window;
 	unsigned char * ptr1;
 	int i,j,k;
-	
+
 	window=(About_box *)v;
-	
+
 	if(window->shown())
 	{
 		demostate = 1;
 		startAudioOut();
 		window->make_current();
 		uintro_getnextframe(window->ui_context);
-		
+
 		ptr1=(unsigned char*)window->ui_context->framebuffer;
 		k=0;
 		j=0;
@@ -175,7 +175,7 @@ static void tick(void *v)
 			ptr1[j++]=ptr1[k+0];
 			k=k+4;
 		}
-		
+
 		fl_draw_image((unsigned char *)window->ui_context->framebuffer, window->xpos_size, window->ypos_size, window->xsize, window->ysize, 3, 0);
 	}
 	else
@@ -188,8 +188,8 @@ static void tick(void *v)
 		stopAudioOut();
 	}
 
-	
-	Fl::repeat_timeout(0.02, tick, v);	
+
+	Fl::repeat_timeout(0.02, tick, v);
 }
 
 
@@ -200,7 +200,7 @@ void close(Fl_Widget *w, void * t)
 	w->parent()->hide();
 }
 
-void create_license_window(Fl_Widget *, void *) 
+void create_license_window(Fl_Widget *, void *)
 {
 	new License_box();
 	return ;
@@ -208,16 +208,25 @@ void create_license_window(Fl_Widget *, void *)
 
 void OpenURLInBrowser(Fl_Widget *,void* u)
 {
-	char * url;
-	url=(char*)u;
 	#if defined (WIN32)
+		char * url;
+		url=(char*)u;
+
 		ShellExecute(HWND_DESKTOP, "open", url, NULL, NULL, SW_SHOW);
 	#elif defined (OSX)
+		char * url;
 		char commandString[2048];
+
+		url=(char*)u;
+
 		sprintf(commandString, "open %s", url);
 		system(commandString);
 	#elif defined (__amigaos4__)
+		char * url;
 		char commandString[2048];
+
+		url=(char*)u;
+
 		sprintf(commandString, "ibrowse:ibrowse %s", url);
 		system(commandString);
 	#endif
@@ -225,8 +234,8 @@ void OpenURLInBrowser(Fl_Widget *,void* u)
 
 About_box::~About_box()
 {
-	Fl::remove_timeout(tick,0); 
-	
+	Fl::remove_timeout(tick,0);
+
 	stopAudioOut();
 
     uintro_deinit(this->ui_context);
@@ -235,7 +244,7 @@ About_box::~About_box()
 About_box::About_box()
   : Fl_Window(530,240)
 {
-	
+
 
 	o = new Fl_Box(5, 15, 180, 25, "HxC FLoppy Emulator");
 	o->box(FL_DOWN_BOX);
@@ -251,7 +260,7 @@ About_box::About_box()
 
 	button_license=		new Fl_Button(5, 110+25*3, 180, 25, "Under GPL License");
 	button_license->callback(create_license_window,0);
-	
+
 	button_ok=new Fl_Button(5, 110+25*4, 180/2, 25, "OK" ); // Fl_Button* o
 	button_ok->callback(close,0);
 
@@ -268,7 +277,7 @@ About_box::About_box()
 
 	ui_context=uintro_init(xsize,ysize);
 	gb_ui_context = ui_context;
-	
+
 
 	this->end();
 
@@ -281,7 +290,7 @@ About_box::About_box()
 	demostate = 0;
 
 	tick(this);
-	
+
 	return ;
 }
 

HxCFloppyEmulator_software/sources/gui/cb_batch_converter_window.cxx

@@ -159,6 +159,7 @@ int draganddropconvert(HXCFE* floppycontext,char ** filelist,char * destfolder,i
 
 	mw =(Main_Window*) guicontext->main_window;
 
+	thefloppydisk = 0;
 	imgldr_ctx = hxcfe_imgInitLoader( floppycontext );
 	if(imgldr_ctx)
 	{
@@ -372,6 +373,9 @@ int browse_and_convert_directory(HXCFE* floppycontext,char * folder,char * destf
 
 	mw =(Main_Window*) guicontext->main_window;
 
+	loaderid = -1;
+	thefloppydisk = 0;
+
 	imgldr_ctx = hxcfe_imgInitLoader( floppycontext );
 	if(imgldr_ctx)
 	{
@@ -603,12 +607,9 @@ int browse_and_convert_directory(HXCFE* floppycontext,char * folder,char * destf
 
 int convertthread(void* floppycontext,void* hw_context)
 {
-
-	HXCFE* floppyem;
 	batch_converter_window *bcw;
 	char * tempstr;
 
-	floppyem=(HXCFE*)floppycontext;
 	bcw=(batch_converter_window *)hw_context;
 
 	memset(&bcparams,0,sizeof(batchconverterparams));
@@ -647,8 +648,6 @@ int convertthread(void* floppycontext,void* hw_context)
 
 int draganddropconvertthread(void* floppycontext,void* hw_context)
 {
-
-	HXCFE* floppyem;
 	batch_converter_window *bcw;
 	batchconverterparams bcparams;
 	char * tempstr;
@@ -656,7 +655,6 @@ int draganddropconvertthread(void* floppycontext,void* hw_context)
 	int filecount,i,j,k;
 	char ** filelist;
 
-	floppyem=(HXCFE*)floppycontext;
 	bcparams2=(s_param_bc_params *)hw_context;
 	bcw=bcparams2->bcw;
 

HxCFloppyEmulator_software/sources/gui/cb_edittool_window.cxx

@@ -279,8 +279,8 @@ void edittool_window_bt_insert_callback(Fl_Button *o, void *v)
 	int valmodif;
 	int track,side;
 	trackedittool_window *tew;
-	int startpulse,endpulse;
-	int i,tracklen,loop;
+	int startpulse;
+	int i,tracklen;
 	char * copybuffer;
 
 	hxc_entercriticalsection(guicontext->hxcfe,1);
@@ -300,23 +300,12 @@ void edittool_window_bt_insert_callback(Fl_Button *o, void *v)
 		fiw->side_number_slide->value(side);
 
 	startpulse = atoi(tew->edit_startpoint->value());
-	endpulse = atoi(tew->edit_endpoint->value());
 	tracklen = hxcfe_getTrackLength(guicontext->hxcfe,guicontext->loadedfloppy,track,side);
 
 	curside = hxcfe_getSide(guicontext->hxcfe,guicontext->loadedfloppy,track,side);
 	if(curside)
 	{
 		startpulse = startpulse % tracklen;
-		endpulse = endpulse % tracklen;
-
-		if(startpulse<endpulse)
-		{
-			loop = endpulse - startpulse;
-		}
-		else
-		{
-			loop = ( hxcfe_getTrackLength(guicontext->hxcfe, guicontext->loadedfloppy, track, side ) - startpulse ) + endpulse;
-		}
 
 		copybuffer = (char*)tew->edit_editbuffer->value();
 		if(copybuffer)
@@ -453,7 +442,6 @@ void edittool_window_bt_shift_callback(Fl_Button *o, void *v)
 void edittool_window_bt_shifttracks_callback(Fl_Button *o, void *v)
 {
 	Main_Window *window;
-	floppy_infos_window *fiw;
 	trackedittool_window *tew;
 	int shiftpulse;
 
@@ -461,7 +449,6 @@ void edittool_window_bt_shifttracks_callback(Fl_Button *o, void *v)
 
 	window = (Main_Window *)guicontext->main_window;
 	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
 
 	shiftpulse = atoi(tew->edit_shiftbittracks->value());
 
@@ -534,15 +521,8 @@ void edittool_window_bt_repair_callback(Fl_Button *o, void *v)
 
 void edittool_window_bt_swapsides_callback(Fl_Button *o, void *v)
 {
-	Main_Window *window;
-	floppy_infos_window *fiw;
 	HXCFE_SIDE * side0,* side1;
 	int track;
-	trackedittool_window *tew;
-
-	window = (Main_Window *)guicontext->main_window;
-	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
 
 	hxc_entercriticalsection(guicontext->hxcfe,1);
 
@@ -711,7 +691,6 @@ void edittool_window_bt_copy_callback(Fl_Button *o, void *v)
 void edittool_window_bt_setdiskrpm_callback(Fl_Button *o, void *v)
 {
 	Main_Window *window;
-	floppy_infos_window *fiw;
 	HXCFE_SIDE * curside;
 	int track,side;
 	trackedittool_window *tew;
@@ -720,7 +699,6 @@ void edittool_window_bt_setdiskrpm_callback(Fl_Button *o, void *v)
 
 	window = (Main_Window *)guicontext->main_window;
 	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
 
 	for(side=0;side<hxcfe_getNumberOfSide(guicontext->hxcfe,guicontext->loadedfloppy);side++)
 	{
@@ -742,7 +720,6 @@ void edittool_window_bt_setdiskrpm_callback(Fl_Button *o, void *v)
 void edittool_window_bt_setdiskbitrate_callback(Fl_Button *o, void *v)
 {
 	Main_Window *window;
-	floppy_infos_window *fiw;
 	HXCFE_SIDE * curside;
 	int track,side;
 	trackedittool_window *tew;
@@ -752,7 +729,6 @@ void edittool_window_bt_setdiskbitrate_callback(Fl_Button *o, void *v)
 
 	window = (Main_Window *)guicontext->main_window;
 	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
 
 	for(side=0;side<hxcfe_getNumberOfSide(guicontext->hxcfe,guicontext->loadedfloppy);side++)
 	{
@@ -776,17 +752,10 @@ void edittool_window_bt_setdiskbitrate_callback(Fl_Button *o, void *v)
 
 void edittool_window_bt_erase_side0_callback(Fl_Button *o, void *v)
 {
-	Main_Window *window;
-	floppy_infos_window *fiw;
 	HXCFE_SIDE * curside;
 	int track;
-	trackedittool_window *tew;
 	int j,tracklen;
 
-	window = (Main_Window *)guicontext->main_window;
-	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
-
 	hxc_entercriticalsection(guicontext->hxcfe,1);
 
 	if(hxcfe_getNumberOfSide(guicontext->hxcfe,guicontext->loadedfloppy))
@@ -818,17 +787,10 @@ void edittool_window_bt_erase_side0_callback(Fl_Button *o, void *v)
 
 void edittool_window_bt_erase_side1_callback(Fl_Button *o, void *v)
 {
-	Main_Window *window;
-	floppy_infos_window *fiw;
 	HXCFE_SIDE * curside;
 	int track;
-	trackedittool_window *tew;
 	int j,tracklen;
 
-	window = (Main_Window *)guicontext->main_window;
-	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
-
 	hxc_entercriticalsection(guicontext->hxcfe,1);
 
 	if(hxcfe_getNumberOfSide(guicontext->hxcfe,guicontext->loadedfloppy) == 2)
@@ -862,12 +824,10 @@ void edittool_window_bt_erase_side1_callback(Fl_Button *o, void *v)
 void edittool_window_bt_addtrack_callback(Fl_Button *o, void *v)
 {
 	Main_Window *window;
-	floppy_infos_window *fiw;
 	trackedittool_window *tew;
 
 	window = (Main_Window *)guicontext->main_window;
 	tew = (trackedittool_window *)window->trackedit_window;
-	fiw = (floppy_infos_window *)window->infos_window;
 
 	hxc_entercriticalsection(guicontext->hxcfe,1);
 

HxCFloppyEmulator_software/sources/gui/cb_filesystem_generator_window.cxx

@@ -1368,6 +1368,8 @@ int draganddropfsthread(void* floppycontext,void* hw_context)
 	floppyem=(HXCFE*)floppycontext;
 	fsparams2=(s_param_fs_params *)hw_context;
 
+	ret = -1;
+
 	if(floppyem && fsparams2)
 	{
 		fsw=fsparams2->fsw;

HxCFloppyEmulator_software/sources/gui/cb_floppy_dump_window.cxx

@@ -93,9 +93,6 @@ typedef struct trackmode_
 	unsigned char encoding_mode; // 0 Fm other MFM
 }trackmode;
 
-
-static floppydumperparams fdparams;
-
 trackmode tm[]=
 {
 	{0,500000,0,0xFF},
@@ -128,9 +125,9 @@ void tick_dump(void *w) {
 	Fl::repeat_timeout(0.02, tick_dump, w);
 }
 
+#ifdef WIN32
 static int checkversion(void)
 {
-#ifdef WIN32
 	DWORD version = 0;
 	DWORD ret;
 	HANDLE h;
@@ -147,11 +144,8 @@ static int checkversion(void)
 		return 0;
 	}
 	return version;
-#else
-    return 0;
-#endif
-
 }
+#endif
 
 #ifdef WIN32
 static void closedevice(HANDLE h)

HxCFloppyEmulator_software/sources/gui/cb_floppy_infos_window.cxx

@@ -87,14 +87,10 @@ static int progress_callback(unsigned int current,unsigned int total,void * td,v
 {
 	int i,j,k;
 	s_gui_context * guicontext;
-	Main_Window *window;
-	floppy_infos_window *finfow;
 	HXCFE_TD * ltd;
 	unsigned char *ptr1;
 
 	guicontext = (s_gui_context *)user;
-	window = (Main_Window *)guicontext->main_window;
-	finfow = (floppy_infos_window *)window->infos_window;
 
 	ltd = td;
 
@@ -392,15 +388,6 @@ int InfosThreadProc(void* floppycontext,void* context)
 	return 0;
 }
 
-void floppy_infos_window_bt_read(Fl_Button* bt, void*)
-{
-	floppy_infos_window *fdw;
-	Fl_Window *dw;
-
-	dw=((Fl_Window*)(bt->parent()));
-	fdw=(floppy_infos_window *)dw->user_data();
-}
-
 void floppy_infos_ok(Fl_Button*, void* w)
 {
 	floppy_infos_window *fdw;
@@ -427,10 +414,6 @@ void disk_infos_window_bt_edit_callback(Fl_Widget *o, void *v)
 
 	mwindow = (Main_Window *)guicontext->main_window;
 
-	floppy_infos_window *window;
-
-	window=((floppy_infos_window*)(o->user_data()));
-
 	mwindow->trackedit_window->window->show();
 }
 
@@ -539,9 +522,8 @@ int isTheRightSector(floppy_infos_window *fiw,s_sectorlist * sl,int xpos,int ypo
 
 int isTheRightPulse(floppy_infos_window *fiw,s_pulseslist * pl,int xpos,int ypos)
 {
-	int disp_xsize,disp_ysize;
+	int disp_ysize;
 
-	disp_xsize=fiw->floppy_map_disp->w();
 	disp_ysize=fiw->floppy_map_disp->h();
 
 	if(!fiw->disc_view_bt->value())
@@ -558,11 +540,6 @@ int isTheRightPulse(floppy_infos_window *fiw,s_pulseslist * pl,int xpos,int ypos
 
 int isTheRightPulseFlakey(floppy_infos_window *fiw,s_pulseslist * pl,int xpos,int ypos)
 {
-	int disp_xsize,disp_ysize;
-
-	disp_xsize=fiw->floppy_map_disp->w();
-	disp_ysize=fiw->floppy_map_disp->h();
-
 	if(!fiw->disc_view_bt->value())
 	{
 		if( ( xpos>=pl->x_pos1 && xpos<=pl->x_pos2 ) &&
@@ -577,11 +554,6 @@ int isTheRightPulseFlakey(floppy_infos_window *fiw,s_pulseslist * pl,int xpos,in
 
 int isTheRightPulseIndex(floppy_infos_window *fiw,s_pulseslist * pl,int xpos,int ypos)
 {
-	int disp_xsize,disp_ysize;
-
-	disp_xsize=fiw->floppy_map_disp->w();
-	disp_ysize=fiw->floppy_map_disp->h();
-
 	if(!fiw->disc_view_bt->value())
 	{
 		if( ( xpos>=pl->x_pos1 && xpos<=pl->x_pos2 ) &&

HxCFloppyEmulator_software/sources/gui/main_gui.cxx

@@ -490,13 +490,6 @@ void load_file_image_pb(Fl_Widget * widget, void * ptr)
 	load_file_image(widget,ptr);
 }
 
-void fc_callback(Fl_File_Chooser * fc, void *)
-{
-	const char * fp;
-	fp=fc->value();
-}
-
-
 #define BUTTON_XPOS 5
 #define BUTTON_YPOS 30
 #define BUTTON_XSIZE 100

HxCFloppyEmulator_software/sources/loader.cxx

@@ -186,13 +186,22 @@ HXCFE_FLOPPY * loadrawimage(HXCFE* floppycontext,cfgrawfile * rfc,char * file,in
 	int offset;
 	HXCFE_FLOPPY * fp;
 
+	*ret = HXCFE_ACCESSERROR;
+
 	f=0;
 	fp = 0;
 	if(file)
+	{
 		f=hxc_fopen(file,"r+b");
+		if(!f)
+		{
+			return 0;
+		}
+	}
 
 	if(f || file==NULL)
 	{
+
 		nbside=(rfc->sidecfg)&2?2:1;
 
 		if(f)
@@ -204,6 +213,8 @@ HXCFE_FLOPPY * loadrawimage(HXCFE* floppycontext,cfgrawfile * rfc,char * file,in
 		fb=hxcfe_initFloppy(floppycontext,rfc->numberoftrack,nbside);
 		if(fb)
 		{
+			*ret = HXCFE_NOERROR;
+
 			hxcfe_setTrackInterleave(fb,rfc->interleave);
 			hxcfe_setSectorFill(fb,rfc->fillvalue);
 
@@ -264,7 +275,11 @@ HXCFE_FLOPPY * loadrawimage(HXCFE* floppycontext,cfgrawfile * rfc,char * file,in
 						}
 
 						fseek(f,offset,SEEK_SET);
-						fread(trackbuffer,(128<<rfc->sectorsize)*rfc->sectorpertrack,1,f);
+						if(!fread(trackbuffer,(128<<rfc->sectorsize)*rfc->sectorpertrack,1,f))
+						{
+							*ret = HXCFE_ACCESSERROR;
+						}
+
 					}
 
 					// add all sectors
@@ -293,8 +308,6 @@ HXCFE_FLOPPY * loadrawimage(HXCFE* floppycontext,cfgrawfile * rfc,char * file,in
 		}
 	}
 
-	*ret = 0;
-
 	return fp;
 }
 
@@ -330,9 +343,7 @@ int loadrawfile(HXCFE* floppycontext,cfgrawfile * rfc,char * file)
 
 		if(guicontext->loadedfloppy)
 		{
-			ret=HXCFE_NOERROR;
-
-			guicontext->loadstatus=ret;
+			guicontext->loadstatus = ret;
 
 			if(file)
 				strcpy(guicontext->bufferfilename,hxc_getfilenamebase(file,0));

HxCFloppyEmulator_software/sources/soft_cfg_file.cxx

@@ -60,7 +60,10 @@ int load_last_cfg()
 	f=hxc_fopen(executablepath,"rb");
 	if(f)
 	{
-		fread(lastst,sizeof(cfg_file_buffer),1,f);
+		if(!fread(lastst,sizeof(cfg_file_buffer),1,f))
+		{
+			memset(lastst,0,sizeof(cfg_file_buffer));
+		}
 		hxc_fclose(f);
 
 //		hwif->usbstats.packetsize=lastst->usb_packet_size;
@@ -87,7 +90,7 @@ int save_cfg()
 
 	lastst=(laststate *)&cfg_file_buffer;
 
-	memset(&cfg_file_buffer,0,sizeof(laststate));
+	memset(&cfg_file_buffer,0,sizeof(cfg_file_buffer));
 
 	hxc_getcurrentdirectory(executablepath,512);