Fix return types.

10 files changed, 240 insertions, 1 deletions

diff --git a/parallel/dqs/distinfo b/parallel/dqs/distinfo
index a78d76d663e..651f6b8ffa1 100644
--- a/parallel/dqs/distinfo
+++ b/parallel/dqs/distinfo
@@ -1,8 +1,17 @@
-$NetBSD: distinfo,v 1.8 2009/12/10 21:19:16 asau Exp $
+$NetBSD: distinfo,v 1.9 2013/03/28 21:37:23 joerg Exp $
 
 SHA1 (DQS-3.3.2.tgz) = fbb165cc058dcbda8bcfa6dbead78e2f1a4f031e
 RMD160 (DQS-3.3.2.tgz) = eb32ef1cd8243b508fbee91710982637de185b7a
 Size (DQS-3.3.2.tgz) = 1498996 bytes
+SHA1 (patch-SRC_dqs__parse.c) = d25940416e918238a034ac7a663d1ce1fed743fb
+SHA1 (patch-SRC_dqs__parse__qconf.c) = 7446f326d433a70c81ee9521e9f69cbb89451f78
+SHA1 (patch-SRC_dqs__select__queue.c) = 5a2d7a943bf3d1aa111ce8363380209a640982b9
+SHA1 (patch-SRC_dqs__setenv.c) = 2e0fe74fdafd2eafa0097d9d72752226659a930f
+SHA1 (patch-SRC_dqs__show.c) = 11c559b3a3272a0b9a76d335e53985b8e61a31df
+SHA1 (patch-SRC_dqs__sig__handlers.c) = 335c45fb5cb213ccb141cfee17c6c13fc1778f26
+SHA1 (patch-SRC_dqs__utility.c) = 169d92683573739c99215635b9724a1b9763fe71
+SHA1 (patch-SRC_func.h) = 1e23b0a3a200487ac3adbc75952494e8e0ec31b7
+SHA1 (patch-SRC_qstat.c) = c8c4d5a3383521bb0427ce7ebcbb517bcd37a99d
 SHA1 (patch-aa) = f5c4ec9c4be1b55edd82dabfe75445bcf76e62b2
 SHA1 (patch-ab) = 8cb54cb86c7558da60ff6fb329ca71a671a0dded
 SHA1 (patch-ac) = c72be633789525f73bb0e1415ff7b300b7576e7e
diff --git a/parallel/dqs/patches/patch-SRC_dqs__parse.c b/parallel/dqs/patches/patch-SRC_dqs__parse.c
new file mode 100644
index 00000000000..2fdf43c58b9
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__parse.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-SRC_dqs__parse.c,v 1.1 2013/03/28 21:37:23 joerg Exp $
+
+--- SRC/dqs_parse.c.orig	2000-10-01 23:57:33.000000000 +0000
++++ SRC/dqs_parse.c
+@@ -2837,9 +2837,7 @@ void dqs_parse_user_list(head,user_str)
+ 
+ 
+ /***************************************************************************/
+-void *dqs_get_env_list(head,envp)
+-     dqs_list_type **head;
+-     char **envp;
++void dqs_get_env_list(dqs_list_type **head, char **envp)
+      
+      /*
+        str0 = env_name
diff --git a/parallel/dqs/patches/patch-SRC_dqs__parse__qconf.c b/parallel/dqs/patches/patch-SRC_dqs__parse__qconf.c
new file mode 100644
index 00000000000..7dace6d1c27
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__parse__qconf.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-SRC_dqs__parse__qconf.c,v 1.1 2013/03/28 21:37:23 joerg Exp $
+
+--- SRC/dqs_parse_qconf.c.orig	2013-03-28 16:17:09.000000000 +0000
++++ SRC/dqs_parse_qconf.c
+@@ -1200,11 +1200,7 @@ dqs_list_type *dqs_parse_qconf(argv_head
+ }
+ 
+ /***********************************************************************/
+-void *dqs_parse_destination_id_list(head,cp,opt)
+-     dqs_list_type **head;
+-     char          *cp;
+-     int           opt;
+-     
++void dqs_parse_destination_id_list(dqs_list_type **head, char *cp, int opt)
+ {
+   
+   dqs_list_type listel;
diff --git a/parallel/dqs/patches/patch-SRC_dqs__select__queue.c b/parallel/dqs/patches/patch-SRC_dqs__select__queue.c
new file mode 100644
index 00000000000..a294b651041
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__select__queue.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-SRC_dqs__select__queue.c,v 1.1 2013/03/28 21:37:23 joerg Exp $
+
+--- SRC/dqs_select_queue.c.orig	2013-03-28 16:10:42.000000000 +0000
++++ SRC/dqs_select_queue.c
+@@ -1054,8 +1054,7 @@ int dqs_return_consumable(job, cname,  a
+ 
+ 
+ /************************************************************/
+-int dqs_reset_consumable(cname)
+-     char *cname;
++void dqs_reset_consumable(char *cname)
+ {
+   dqs_list_type *cons_lp;
+   dqs_list_type *cp;
diff --git a/parallel/dqs/patches/patch-SRC_dqs__setenv.c b/parallel/dqs/patches/patch-SRC_dqs__setenv.c
new file mode 100644
index 00000000000..c09d54727f9
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__setenv.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-SRC_dqs__setenv.c,v 1.1 2013/03/28 21:37:23 joerg Exp $
+
+--- SRC/dqs_setenv.c.orig	2013-03-28 16:20:07.000000000 +0000
++++ SRC/dqs_setenv.c
+@@ -70,11 +70,7 @@ static char dqs_setenv_rcsid[]="$Id: dqs
+ extern char **environ;
+ 
+ /*****************************************************************************/
+-int dqs_setenv(name,value,overwrite)
+-     char *name;
+-     char *value;
+-     int  overwrite;
+-     
++void dqs_setenv(char *name, char *value, int overwrite)
+ {
+   int i = 0;
+   int varlen;
diff --git a/parallel/dqs/patches/patch-SRC_dqs__show.c b/parallel/dqs/patches/patch-SRC_dqs__show.c
new file mode 100644
index 00000000000..c22855ba7cf
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__show.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-SRC_dqs__show.c,v 1.1 2013/03/28 21:37:23 joerg Exp $
+
+--- SRC/dqs_show.c.orig	2013-03-28 16:22:14.000000000 +0000
++++ SRC/dqs_show.c
+@@ -46,9 +46,7 @@ static char dqs_show_rcsid[]="$Id: dqs_s
+ #include "dqs_errno.h"
+ 
+ /************************************************************************/
+-int dqs_show_qstat_request(job)
+-     dqs_job_type *job;
+-     
++void dqs_show_qstat_request(dqs_job_type *job)
+ {
+   
+   int i;
diff --git a/parallel/dqs/patches/patch-SRC_dqs__sig__handlers.c b/parallel/dqs/patches/patch-SRC_dqs__sig__handlers.c
new file mode 100644
index 00000000000..3e37ee9fd67
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__sig__handlers.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-SRC_dqs__sig__handlers.c,v 1.1 2013/03/28 21:37:23 joerg Exp $
+
+--- SRC/dqs_sig_handlers.c.orig	2013-03-28 16:19:11.000000000 +0000
++++ SRC/dqs_sig_handlers.c
+@@ -351,7 +351,7 @@ void dqs_reap()
+ }
+ 
+ /************************************************************************************/
+-int dqs_reap_children()
++void dqs_reap_children(void)
+      
+      /* 
+ 	several things have to be done here
diff --git a/parallel/dqs/patches/patch-SRC_dqs__utility.c b/parallel/dqs/patches/patch-SRC_dqs__utility.c
new file mode 100644
index 00000000000..be49067b912
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_dqs__utility.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-SRC_dqs__utility.c,v 1.1 2013/03/28 21:37:24 joerg Exp $
+
+--- SRC/dqs_utility.c.orig	2013-03-28 16:13:40.000000000 +0000
++++ SRC/dqs_utility.c
+@@ -2025,8 +2025,7 @@ void dqs_show_states(how,states)
+ }
+ 
+ /************************************************************************/
+-int dqs_show_queue_states(state)
+-     int state;
++void dqs_show_queue_states(int state)
+ {
+   
+   DENTER_EXT((DQS_EVENT,"dqs_show_queue_states"));
diff --git a/parallel/dqs/patches/patch-SRC_func.h b/parallel/dqs/patches/patch-SRC_func.h
new file mode 100644
index 00000000000..e652362a4d3
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_func.h
@@ -0,0 +1,85 @@
+$NetBSD: patch-SRC_func.h,v 1.1 2013/03/28 21:37:24 joerg Exp $
+
+--- SRC/func.h.orig	2013-03-28 16:11:01.000000000 +0000
++++ SRC/func.h
+@@ -185,7 +185,7 @@ int dqs_return_consumable (dqs_job_type 
+ #ifdef NO_PROTO
+ int dqs_reset_consumable ();
+ #else
+-int dqs_reset_consumable (char *cname);
++void dqs_reset_consumable (char *cname);
+ #endif
+ #ifdef NO_PROTO
+ int dqs_validate_resources ();
+@@ -568,9 +568,9 @@ void dqs_parse_user_list ();
+ void dqs_parse_user_list (dqs_list_type **head, char *user_str);
+ #endif
+ #ifdef NO_PROTO
+-void * dqs_get_env_list ();
++void dqs_get_env_list ();
+ #else
+-void * dqs_get_env_list (dqs_list_type **head, char **envp);
++void dqs_get_env_list (dqs_list_type **head, char **envp);
+ #endif
+ #ifdef NO_PROTO
+ void dqs_parse_destination_identifier_list ();
+@@ -843,9 +843,9 @@ void dqs_show_states ();
+ void dqs_show_states (u_long32 how, u_long32 states);
+ #endif
+ #ifdef NO_PROTO
+-int dqs_show_queue_states ();
++void dqs_show_queue_states ();
+ #else
+-int dqs_show_queue_states (int state);
++void dqs_show_queue_states (int state);
+ #endif
+ #ifdef NO_PROTO
+ u_long32 dqs_get_gmt ();
+@@ -1103,9 +1103,9 @@ dqs_list_type * dqs_parse_qconf ();
+ dqs_list_type * dqs_parse_qconf (dqs_list_type *argv_head, char **envp);
+ #endif
+ #ifdef NO_PROTO
+-void * dqs_parse_destination_id_list ();
++void dqs_parse_destination_id_list ();
+ #else
+-void * dqs_parse_destination_id_list (dqs_list_type **head, char *cp, int opt);
++void dqs_parse_destination_id_list (dqs_list_type **head, char *cp, int opt);
+ #endif
+ #ifdef NO_PROTO
+ void dqs_parse_name_list ();
+@@ -1198,9 +1198,9 @@ void dqs_reap ();
+ void dqs_reap ();
+ #endif
+ #ifdef NO_PROTO
+-int dqs_reap_children ();
++void dqs_reap_children ();
+ #else
+-int dqs_reap_children ();
++void dqs_reap_children (void);
+ #endif
+ #ifdef NO_PROTO
+ void dqs_c_qconf ();
+@@ -1288,9 +1288,9 @@ int dqs_exec_mail ();
+ int dqs_exec_mail (dqs_queue_type *qconf, dqs_job_type *job, int tag, string str);
+ #endif
+ #ifdef NO_PROTO
+-int dqs_setenv ();
++void dqs_setenv ();
+ #else
+-int dqs_setenv (char *name, char *value, int overwrite);
++void dqs_setenv (char *name, char *value, int overwrite);
+ #endif
+ #ifdef NO_PROTO
+ int dqs_reauth ();
+@@ -1343,9 +1343,9 @@ void dqs_get_passwd_info ();
+ void dqs_get_passwd_info (dqs_job_type *job);
+ #endif
+ #ifdef NO_PROTO
+-int dqs_show_qstat_request ();
++void dqs_show_qstat_request ();
+ #else
+-int dqs_show_qstat_request (dqs_job_type *job);
++void dqs_show_qstat_request (dqs_job_type *job);
+ #endif
+ #ifdef NO_PROTO
+ void dqs_job_exit ();
diff --git a/parallel/dqs/patches/patch-SRC_qstat.c b/parallel/dqs/patches/patch-SRC_qstat.c
new file mode 100644
index 00000000000..6a817f98393
--- /dev/null
+++ b/parallel/dqs/patches/patch-SRC_qstat.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-SRC_qstat.c,v 1.1 2013/03/28 21:37:24 joerg Exp $
+
+--- SRC/qstat.c.orig	2013-03-28 16:23:29.000000000 +0000
++++ SRC/qstat.c
+@@ -114,6 +114,9 @@ char *dqs_ctime();
+ #include "globals.h"
+ #include "dqs_errno.h"
+ 
++static void dqs_print_job(dqs_job_type *qstat_conf, char *master, dqs_job_type *job, string qname);
++static void dqs_qstat_print_queue(dqs_job_type *qstat_conf, dqs_queue_type *q);
++
+ int              q_suitability=0;
+ int              j_suitability=0;
+ int              l_suitability=0;
+@@ -375,10 +378,7 @@ main(argc, argv,envp)
+ } 
+ 
+ /***************************************************************************/
+-int dqs_qstat_print_queue(qstat_conf,q)
+-     dqs_job_type *qstat_conf;
+-     dqs_queue_type *q;
+-     
++static void dqs_qstat_print_queue(dqs_job_type *qstat_conf, dqs_queue_type *q)
+ {
+   
+   float         load_avg;
+@@ -437,12 +437,7 @@ int dqs_qstat_print_queue(qstat_conf,q)
+ }
+ 
+ /***************************************************************************/
+-int dqs_print_job(qstat_conf,master,job, qname)
+-     dqs_job_type *qstat_conf;
+-     char         *master;
+-     dqs_job_type *job;
+-     string qname;
+-     
++static void dqs_print_job(dqs_job_type *qstat_conf, char *master, dqs_job_type *job, string qname)
+ {
+   dqs_list_type *lp3;
+   string job_name;