From d96f2d55952593c63ae24e3c9d33493ff581deb6 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 20 Oct 2012 22:11:30 +0000
Subject: Return without value iff the function has a return type of void.

---
 lang/caml-light/distinfo                     |  10 ++-
 lang/caml-light/patches/patch-ae             |  11 ++-
 lang/caml-light/patches/patch-yacc_error.c   |  13 +++
 lang/caml-light/patches/patch-yacc_main_c    |  11 ++-
 lang/caml-light/patches/patch-yacc_output.c  |  52 ++++++++++++
 lang/caml-light/patches/patch-yacc_reader.c  | 122 +++++++++++++++++++++++++++
 lang/caml-light/patches/patch-yacc_verbose.c |  13 +++
 7 files changed, 227 insertions(+), 5 deletions(-)
 create mode 100644 lang/caml-light/patches/patch-yacc_error.c
 create mode 100644 lang/caml-light/patches/patch-yacc_output.c
 create mode 100644 lang/caml-light/patches/patch-yacc_reader.c
 create mode 100644 lang/caml-light/patches/patch-yacc_verbose.c

(limited to 'lang')

diff --git a/lang/caml-light/distinfo b/lang/caml-light/distinfo
index ca6d21d95e3..e3d458a0304 100644
--- a/lang/caml-light/distinfo
+++ b/lang/caml-light/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/11/06 19:32:07 dholland Exp $
+$NetBSD: distinfo,v 1.10 2012/10/20 22:11:30 joerg Exp $
 
 SHA1 (cl74unix.tar.gz) = feae4a53af78b6c500a03c618dc11444e8b5dc47
 RMD160 (cl74unix.tar.gz) = a00a8de15e042080041076fcf3ad2592d9deb469
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 6d3bc6249267789806ad4eef1b36aa809277a930
 SHA1 (patch-ab) = 3098db9faa0cd60931c781b4b24f796ac23ef52d
 SHA1 (patch-ac) = 6b268ddd007f73a8bb4085df4826627425eb9658
 SHA1 (patch-ad) = 22c97a5a2ee4a45cd85ae4c886b61cdcf833703a
-SHA1 (patch-ae) = 8de237bfb4b9a1c17e1cf4ad9c4abb7b1b456698
+SHA1 (patch-ae) = 800928059c173bdcdf61330118d5da82f6d31e3b
 SHA1 (patch-af) = 196fb2ace8ab078bccb2c8dba8b8cff211e6e95c
 SHA1 (patch-ag) = fce329f96d369f86c6fe7e3a30d78bed003d7043
 SHA1 (patch-ah) = 6a83f924ba49ae7121e070dc75432b2009643d9a
@@ -24,4 +24,8 @@ SHA1 (patch-ar) = aba9a829916af887d1115b51a57b449aced8535f
 SHA1 (patch-as) = 5d462ae1a1bf72ae1a0f19ff73d4b1b4226dbb32
 SHA1 (patch-at) = 83c69c1635a0c8f038bcd23d00acc4dc406c0684
 SHA1 (patch-au) = 4fe5ac20d7526e782143874b0ce9c7367716dbce
-SHA1 (patch-yacc_main_c) = 37171cb256ffc85faf4505525ec950d3e31e002c
+SHA1 (patch-yacc_error.c) = ca57d272ddb1b7d4da6eb501abd687f3426bd8d4
+SHA1 (patch-yacc_main_c) = 1a4670c718c4a3ef3e1ace7dd56c2516a8d3fef3
+SHA1 (patch-yacc_output.c) = 2490fcf4ae844c31419f771ccef1a272f948bef5
+SHA1 (patch-yacc_reader.c) = 5bf63ccb86d9e689cc7320424ab918b5de6f9000
+SHA1 (patch-yacc_verbose.c) = 61f3d64819abaf23e02c888ec916c59b29297847
diff --git a/lang/caml-light/patches/patch-ae b/lang/caml-light/patches/patch-ae
index b8b90d30256..60201dfa4b6 100644
--- a/lang/caml-light/patches/patch-ae
+++ b/lang/caml-light/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2008/09/05 02:07:51 dholland Exp $
+$NetBSD: patch-ae,v 1.2 2012/10/20 22:11:30 joerg Exp $
 
 Fix 64-bit build.
 
@@ -13,3 +13,12 @@ Fix 64-bit build.
  #include "misc.h"
  #include "debugger.h"
  #include "mlvalues.h"
+@@ -182,7 +184,7 @@ int debugger(event)
+   value val;
+   value * p;
+ 
+-  if (dbg_socket == -1) return;  /* Not connected to a debugger. */
++  if (dbg_socket == -1) return -1;  /* Not connected to a debugger. */
+ 
+   /* Report the event to the debugger */
+   switch(event) {
diff --git a/lang/caml-light/patches/patch-yacc_error.c b/lang/caml-light/patches/patch-yacc_error.c
new file mode 100644
index 00000000000..3a750108713
--- /dev/null
+++ b/lang/caml-light/patches/patch-yacc_error.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-yacc_error.c,v 1.1 2012/10/20 22:11:30 joerg Exp $
+
+--- yacc/error.c.orig	2012-10-20 13:06:22.000000000 +0000
++++ yacc/error.c
+@@ -34,7 +34,7 @@ unexpected_EOF()
+ }
+ 
+ 
+-print_pos(st_line, st_cptr)
++void print_pos(st_line, st_cptr)
+ char *st_line;
+ char *st_cptr;
+ {
diff --git a/lang/caml-light/patches/patch-yacc_main_c b/lang/caml-light/patches/patch-yacc_main_c
index 70eb15352af..e0994128440 100644
--- a/lang/caml-light/patches/patch-yacc_main_c
+++ b/lang/caml-light/patches/patch-yacc_main_c
@@ -1,4 +1,4 @@
-$NetBSD: patch-yacc_main_c,v 1.1 2011/11/06 19:32:07 dholland Exp $
+$NetBSD: patch-yacc_main_c,v 1.2 2012/10/20 22:11:30 joerg Exp $
 
 Avoid insecure use of mktemp().
 
@@ -32,6 +32,15 @@ Avoid insecure use of mktemp().
  
  done(k)
  int k;
+@@ -121,7 +124,7 @@ usage()
+     exit(1);
+ }
+ 
+-getargs(argc, argv)
++void getargs(argc, argv)
+ int argc;
+ char *argv[];
+ {
 @@ -276,12 +279,21 @@ create_file_names()
      union_file_name[len + 5] = 'u';
  
diff --git a/lang/caml-light/patches/patch-yacc_output.c b/lang/caml-light/patches/patch-yacc_output.c
new file mode 100644
index 00000000000..b2b88aaf2ff
--- /dev/null
+++ b/lang/caml-light/patches/patch-yacc_output.c
@@ -0,0 +1,52 @@
+$NetBSD: patch-yacc_output.c,v 1.1 2012/10/20 22:11:30 joerg Exp $
+
+--- yacc/output.c.orig	2012-10-20 13:08:10.000000000 +0000
++++ yacc/output.c
+@@ -16,6 +16,9 @@ static short *check;
+ static int lowzero;
+ static int high;
+ 
++static void output_trailing_text(void);
++static void output_stored_text(void);
++static void save_column(int symbol, int default_state);
+ 
+ output()
+ {
+@@ -323,9 +326,7 @@ int symbol;
+ 
+ 
+ 
+-save_column(symbol, default_state)
+-int symbol;
+-int default_state;
++static void save_column(int symbol, int default_state)
+ {
+     register int i;
+     register int m;
+@@ -726,7 +727,7 @@ output_transl()
+   fprintf(code_file, "    0|];;\n\n");
+ }
+ 
+-output_stored_text()
++static void output_stored_text(void)
+ {
+     register int c;
+     register FILE *in, *out;
+@@ -757,7 +758,7 @@ output_debug()
+ {
+ }
+ 
+-output_trailing_text()
++void output_trailing_text()
+ {
+     register int c, last;
+     register FILE *in, *out;
+@@ -814,7 +815,7 @@ output_trailing_text()
+ }
+ 
+ 
+-copy_file(file, file_name)
++void copy_file(file, file_name)
+      FILE ** file;
+      char * file_name;
+ {
diff --git a/lang/caml-light/patches/patch-yacc_reader.c b/lang/caml-light/patches/patch-yacc_reader.c
new file mode 100644
index 00000000000..333521c0611
--- /dev/null
+++ b/lang/caml-light/patches/patch-yacc_reader.c
@@ -0,0 +1,122 @@
+$NetBSD: patch-yacc_reader.c,v 1.1 2012/10/20 22:11:30 joerg Exp $
+
+--- yacc/reader.c.orig	2012-10-20 13:12:08.000000000 +0000
++++ yacc/reader.c
+@@ -49,7 +49,7 @@ int c;
+ }
+ 
+ 
+-get_line()
++void get_line(void)
+ {
+     register FILE *f = input_file;
+     register int c;
+@@ -113,7 +113,7 @@ dup_line()
+ }
+ 
+ 
+-skip_comment()
++void skip_comment(void)
+ {
+     register char *s;
+ 
+@@ -268,7 +268,7 @@ keyword()
+ }
+ 
+ 
+-copy_ident()
++void copy_ident(void)
+ {
+     register int c;
+     register FILE *f = output_file;
+@@ -297,7 +297,7 @@ copy_ident()
+ }
+ 
+ 
+-copy_text()
++void copy_text(void)
+ {
+     register int c;
+     int quote;
+@@ -414,7 +414,7 @@ loop:
+ }
+ 
+ 
+-copy_union()
++void copy_union(void)
+ {
+     register int c;
+     int quote;
+@@ -785,8 +785,7 @@ get_tag()
+ }
+ 
+ 
+-declare_tokens(assoc)
+-int assoc;
++void declare_tokens(int assoc)
+ {
+     register int c;
+     register bucket *bp;
+@@ -852,7 +851,7 @@ int assoc;
+ }
+ 
+ 
+-declare_types()
++void declare_types(void)
+ {
+     register int c;
+     register bucket *bp;
+@@ -880,7 +879,7 @@ declare_types()
+ }
+ 
+ 
+-declare_start()
++void declare_start(void)
+ {
+     register int c;
+     register bucket *bp;
+@@ -900,7 +899,7 @@ declare_start()
+ }
+ 
+ 
+-read_declarations()
++void read_declarations(void)
+ {
+     register int c, k;
+ 
+@@ -1124,7 +1123,7 @@ insert_empty_rule()
+ }
+ 
+ 
+-add_symbol()
++void add_symbol(void)
+ {
+     register int c;
+     register bucket *bp;
+@@ -1155,7 +1154,7 @@ add_symbol()
+ }
+ 
+ 
+-copy_action()
++void copy_action(void)
+ {
+     register int c;
+     register int i, n;
+@@ -1397,7 +1396,7 @@ read_grammar()
+ }
+ 
+ 
+-free_tags()
++void free_tags(void)
+ {
+     register int i;
+ 
+@@ -1696,7 +1695,7 @@ pack_grammar()
+ }
+ 
+ 
+-print_grammar()
++void print_grammar(void)
+ {
+     register int i, j, k;
+     int spacing;
diff --git a/lang/caml-light/patches/patch-yacc_verbose.c b/lang/caml-light/patches/patch-yacc_verbose.c
new file mode 100644
index 00000000000..a26a97b8f4a
--- /dev/null
+++ b/lang/caml-light/patches/patch-yacc_verbose.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-yacc_verbose.c,v 1.1 2012/10/20 22:11:30 joerg Exp $
+
+--- yacc/verbose.c.orig	2012-10-20 13:15:43.000000000 +0000
++++ yacc/verbose.c
+@@ -4,7 +4,7 @@
+ 
+ static short *null_rules;
+ 
+-verbose()
++void verbose(void)
+ {
+     register int i;
+ 
-- 
cgit v1.2.3