Commited patch in issue #8171 (by darktjm).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64524 e17a0e51-4ae3-4d35-97c3-1a29b211df97

5 files changed, 33 insertions, 43 deletions

diff --git a/plugins/dfnet/cfg.c b/plugins/dfnet/cfg.c
index 921efbe3..69d25b12 100644
--- a/plugins/dfnet/cfg.c
+++ b/plugins/dfnet/cfg.c
@@ -18,7 +18,8 @@ void SaveConf() {
 
 	f = fopen(CFG_FILENAME, "w");
 	if (f == NULL) return;
-	fwrite(&conf, 1, sizeof(conf), f);
+	if(fwrite(&conf, sizeof(conf), 1, f) != 1)
+		perror(CFG_FILENAME);
 	fclose(f);
 }
 
@@ -33,6 +34,7 @@ void LoadConf() {
 		return;
 	}
 
-	fread(&conf, 1, sizeof(conf), f);
+	if(fread(&conf, sizeof(conf), 1, f) != 1)
+		perror(CFG_FILENAME);
 	fclose(f);
 }
diff --git a/plugins/dfnet/dfnet.c b/plugins/dfnet/dfnet.c
index d76a7574..22fbbe4e 100644
--- a/plugins/dfnet/dfnet.c
+++ b/plugins/dfnet/dfnet.c
@@ -12,9 +12,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
-extern int errno;
 
 #include "dfnet.h"
+#include "psemu_plugin_defs.h"
 
 const unsigned char version  = 2;    // NET library v2
 const unsigned char revision = 0;
diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index 62f38425..4d8ae149 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -18,22 +18,8 @@
 #include <netdb.h>
 #include <unistd.h>
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
-typedef void* HWND;
-
 struct timeval tm;
 
-#define CALLBACK
-
 long timeGetTime();
 
 #include "psemu_plugin_defs.h"
@@ -42,9 +28,9 @@ typedef struct {
 	int PlayerNum;
 	unsigned short PortNum;
 	char ipAddress[32];
-} Config;
+} NetConfig;
 
-Config conf;
+NetConfig conf;
 
 void LoadConf();
 void SaveConf();
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index b1438995..fed9d70b 100644
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -14,8 +14,9 @@
 #include <signal.h>
 
 #include "cfg.c"
+#include "psemu_plugin_defs.h"
 
-void cfgSysMessage(const char *fmt, ...) {
+static void cfgSysMessage(const char *fmt, ...) {
 	GtkWidget *MsgDlg;
 	va_list list;
 	char msg[512];
@@ -34,7 +35,7 @@ void cfgSysMessage(const char *fmt, ...) {
 	gtk_widget_destroy(MsgDlg);
 }
 
-void CFGconfigure() {
+static void CFGconfigure() {
 	cfgSysMessage(_("Nothing to configure"));
 }
 
@@ -45,7 +46,7 @@ void CFGconfigure() {
 
 #define MAXINTERFACES 16
 
-void sockGetIP(char *IPAddress) {
+static void sockGetIP(char *IPAddress) {
 	int fd, intrface;
 	struct ifreq buf[MAXINTERFACES];
 	struct ifconf ifc;
@@ -86,7 +87,7 @@ void sockGetIP(char *IPAddress) {
 
 #endif
 
-void OnCopyIP(GtkWidget *widget, gpointer user_data) {
+static void OnCopyIP(GtkWidget *widget, gpointer user_data) {
 	char str[256];
 
 	sockGetIP(str);
@@ -94,7 +95,7 @@ void OnCopyIP(GtkWidget *widget, gpointer user_data) {
 	cfgSysMessage(_("IP %s"), str);
 }
 
-long CFGopen() {
+static long CFGopen() {
 	GtkBuilder *builder;
 	GtkWidget *widget, *MainWindow;
 	char buf[256];
@@ -108,36 +109,36 @@ long CFGopen() {
 		return 0;
 	}
 
-	MainWindow = gtk_builder_get_object(builder, "dlgStart");
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(builder, "dlgStart"));
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay"));
 
-	widget = gtk_builder_get_object(builder, "btnCopyIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btnCopyIP"));
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = gtk_builder_get_object(builder, "tbServerIP");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
 
-	widget = gtk_builder_get_object(builder, "tbPort");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 	sprintf(buf, "%d", conf.PortNum);
 	gtk_entry_set_text(GTK_ENTRY(widget), buf);
 
 	if (conf.PlayerNum == 1) {
-		widget = gtk_builder_get_object(builder, "rbServer");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	} else {
-		widget = gtk_builder_get_object(builder, "rbClient");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbClient"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	}
 
 	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
-		widget = gtk_builder_get_object(builder, "tbServerIP");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbServerIP"));
 		strcpy(conf.ipAddress, gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = gtk_builder_get_object(builder, "tbPort");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "tbPort"));
 		conf.PortNum = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = gtk_builder_get_object(builder, "rbServer");
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "rbServer"));
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
 			conf.PlayerNum = 1;
 		} else {
@@ -154,11 +155,11 @@ long CFGopen() {
 	return 0;
 }
 
-void OnWaitDialog_Abort() {
+static void OnWaitDialog_Abort() {
 	kill(getppid(), SIGUSR2);
 }
 
-void CFGwait() {
+static void CFGwait() {
 	GtkWidget *WaitDlg;
 
 	WaitDlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
@@ -173,11 +174,11 @@ void CFGwait() {
 	OnWaitDialog_Abort();
 }
 
-long CFGpause() {
+static long CFGpause() {
 	return 0;
 }
 
-void CFGabout() {
+static void CFGabout() {
 	const char *authors[]= {"linuzappz <linuzappz@hotmail.com>", "Wei Mingzhi <whistler_wmz@users.sf.net>", NULL};
 	GtkWidget *widget;
 
@@ -191,7 +192,7 @@ void CFGabout() {
 	gtk_widget_destroy(widget);
 }
 
-long CFGmessage(char *args[], int num) {
+static long CFGmessage(char *args[], int num) {
 	char msg[512];
 
 	memset(msg, 0, sizeof(msg));
diff --git a/plugins/dfnet/unix.c b/plugins/dfnet/unix.c
index 390a5fc3..6b082899 100644
--- a/plugins/dfnet/unix.c
+++ b/plugins/dfnet/unix.c
@@ -15,11 +15,11 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/wait.h>
-extern int errno;
 
 #include "dfnet.h"
+#include "psemu_plugin_defs.h"
 
-int ExecCfg(const char *arg, int f) {
+static int ExecCfg(const char *arg, int f) {
 	char cfg[512];
 
 	strcpy(cfg, "cfg/cfgDFNet");
@@ -27,7 +27,7 @@ int ExecCfg(const char *arg, int f) {
 	strcat(cfg, arg);
 
 	if (f) {
-		if (fork() == 0) { system(cfg); exit(0); }
+		if (fork() == 0) { exit(system(cfg)); }
 		return 0;
 	}
 
@@ -82,8 +82,9 @@ int sockPing() {
 		   (tvn.tv_usec - tv.tv_usec) / 1000;
 }
 
-void CALLBACK NETconfigure() {
+long CALLBACK NETconfigure() {
 	ExecCfg("configure", 1);
+	return 0;
 }
 
 void CALLBACK NETabout() {
@@ -92,7 +93,7 @@ void CALLBACK NETabout() {
 
 pid_t cfgpid = 0;
 
-void OnWaitDlg_Abort(int num) {
+static void OnWaitDlg_Abort(int num) {
 	WaitCancel = 1;
 	cfgpid = 0;
 }