Fix a number of C issues.

5 files changed, 90 insertions, 4 deletions

diff --git a/sysutils/fsviewer/distinfo b/sysutils/fsviewer/distinfo
index a6662665693..842eefd7730 100644
--- a/sysutils/fsviewer/distinfo
+++ b/sysutils/fsviewer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/03/24 12:26:47 joerg Exp $
+$NetBSD: distinfo,v 1.8 2012/05/04 16:34:48 joerg Exp $
 
 SHA1 (FSViewer.app-0.2.5.tar.gz) = 0df2e5c6317f13b2c867c4d07c9840e455134f7d
 RMD160 (FSViewer.app-0.2.5.tar.gz) = 6e11d8c950c4c4b6020b2af33a32d31f7bca371d
@@ -7,5 +7,8 @@ SHA1 (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 7a8c689a30292438c6bd2f282390c7b28
 RMD160 (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 86817447aa7183670e4ea131bf67f8a80a48a5aa
 Size (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 2674 bytes
 SHA1 (patch-aa) = 790b6a6810bf38ffebb0b00f68f29e5ebe01a83d
-SHA1 (patch-ab) = 1ec92778614e0a709ce6313bc546ed047a20167a
+SHA1 (patch-ab) = a0894d4fc9a1e925f1df331c26f23c915699a73f
 SHA1 (patch-ag) = 5496345589bdf7cbf8bd64449f93a7270ce046a0
+SHA1 (patch-src_FSFileButton.c) = 128ebcd74177133d87363cdafad8cf5aa1868d20
+SHA1 (patch-src_FSPanel.c) = 9c9315e50335086e4c0ba7166731dfdefc1967c3
+SHA1 (patch-src_list.h) = eff2f1c3aff21bd02ad53eb54dcc08d33494fe5a
diff --git a/sysutils/fsviewer/patches/patch-ab b/sysutils/fsviewer/patches/patch-ab
index 153f37be25f..c575dcdac7b 100644
--- a/sysutils/fsviewer/patches/patch-ab
+++ b/sysutils/fsviewer/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2006/03/24 12:26:47 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2012/05/04 16:34:48 joerg Exp $
 
---- src/FSUtils.c.orig	2006-03-24 12:19:39.000000000 +0000
+--- src/FSUtils.c.orig	2012-05-04 13:27:48.000000000 +0000
 +++ src/FSUtils.c
 @@ -66,6 +66,10 @@ typedef unsigned long ulong;
  #define DF_COMMAND "df -k"
@@ -13,3 +13,21 @@ $NetBSD: patch-ab,v 1.4 2006/03/24 12:26:47 joerg Exp $
  const char *formatk(ulong k);
  
  static RContext *rContext = NULL;
+@@ -1193,7 +1197,7 @@ FSGetDNDType(FileInfo *fileInfo)
+     char *pathname = NULL;
+ 
+     if(fileInfo == NULL)
+-	return;
++	return -1;
+     
+     switch (fileInfo->fileType)
+     {
+@@ -1227,7 +1231,7 @@ FSExecCommand(char *path, char *execStr)
+     {
+ 	char s[0xff];
+ 	
+-	sprintf(s, _("Error changing to %s, \"%s\" cancelled."), path);
++	sprintf(s, _("Error changing to %s, \"%s\" cancelled."), path, execStr);
+ 	FSErrorDialog(_("Error File Operation"), s);
+ 	
+ 	return 1;
diff --git a/sysutils/fsviewer/patches/patch-src_FSFileButton.c b/sysutils/fsviewer/patches/patch-src_FSFileButton.c
new file mode 100644
index 00000000000..ddc4e941ec0
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-src_FSFileButton.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_FSFileButton.c,v 1.1 2012/05/04 16:34:48 joerg Exp $
+
+--- src/FSFileButton.c.orig	2012-05-04 13:44:22.000000000 +0000
++++ src/FSFileButton.c
+@@ -689,7 +689,7 @@ createTextView(W_Screen *scr, char *text
+     W_View *view = NULL;
+ 
+     if(!text)
+-	return;
++	return NULL;
+ 
+     view = W_CreateTopView(scr);
+     view->attribFlags |= CWOverrideRedirect|CWSaveUnder;
diff --git a/sysutils/fsviewer/patches/patch-src_FSPanel.c b/sysutils/fsviewer/patches/patch-src_FSPanel.c
new file mode 100644
index 00000000000..d08e975ae36
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-src_FSPanel.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_FSPanel.c,v 1.1 2012/05/04 16:34:48 joerg Exp $
+
+--- src/FSPanel.c.orig	2012-05-04 13:30:20.000000000 +0000
++++ src/FSPanel.c
+@@ -748,7 +748,7 @@ FSRunAppInputPanel(FSViewer *app, FileIn
+ {
+     char *result = NULL;
+ 
+-    if (!(appInput = FSCreateAppInputPanel(app, fileInfo, title))) { return; }
++    if (!(appInput = FSCreateAppInputPanel(app, fileInfo, title))) { return NULL; }
+     
+     WMMapWidget(appInput->win);
+ 
+@@ -1205,7 +1205,7 @@ FSRunAlertPanel(FSViewer *app,
+ 
+     if( !(alertPanel = FSCreateAlertPanel(app, title, msg, 
+ 					  defaultButton, alternateButton, 
+-					  otherButton) ) ) {return;}
++					  otherButton) ) ) {return -1;}
+ 
+     WMMapWidget(alertPanel->win);
+ 
+@@ -1392,10 +1392,10 @@ FSRunSelectIconPanel(WMWindow *owner, ch
+     char *imgStr = NULL;
+ 
+     if(selIcon)
+-	return;
++	return NULL;
+ 
+     if (!(selIcon = FSCreateSelectIconPanel(owner, title, str))) 
+-	return;
++	return NULL;
+     
+     WMMapWidget(selIcon->win);
+     
diff --git a/sysutils/fsviewer/patches/patch-src_list.h b/sysutils/fsviewer/patches/patch-src_list.h
new file mode 100644
index 00000000000..1abee2771c1
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-src_list.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_list.h,v 1.1 2012/05/04 16:34:48 joerg Exp $
+
+--- src/list.h.orig	2012-05-04 13:34:36.000000000 +0000
++++ src/list.h
+@@ -29,11 +29,7 @@ Boston, MA 02111-1307, USA.  */
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
++#define INLINE
+ 
+ typedef struct LinkedList {
+   void *head;