Sat Oct 20 22:11:30 2012 UTC ()
Return without value iff the function has a return type of void.
(joerg)
diff -r1.9 -r1.10 pkgsrc/lang/caml-light/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/caml-light/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/lang/caml-light/patches/patch-yacc_main_c
diff -r0 -r1.1 pkgsrc/lang/caml-light/patches/patch-yacc_error.c
diff -r0 -r1.1 pkgsrc/lang/caml-light/patches/patch-yacc_output.c
diff -r0 -r1.1 pkgsrc/lang/caml-light/patches/patch-yacc_reader.c
diff -r0 -r1.1 pkgsrc/lang/caml-light/patches/patch-yacc_verbose.c
--- pkgsrc/lang/caml-light/distinfo 2011/11/06 19:32:07 1.9
+++ pkgsrc/lang/caml-light/distinfo 2012/10/20 22:11:30 1.10
| @@ -1,27 +1,31 @@ | | | @@ -1,27 +1,31 @@ |
1 | $NetBSD: distinfo,v 1.9 2011/11/06 19:32:07 dholland Exp $ | | 1 | $NetBSD: distinfo,v 1.10 2012/10/20 22:11:30 joerg Exp $ |
2 | | | 2 | |
3 | SHA1 (cl74unix.tar.gz) = feae4a53af78b6c500a03c618dc11444e8b5dc47 | | 3 | SHA1 (cl74unix.tar.gz) = feae4a53af78b6c500a03c618dc11444e8b5dc47 |
4 | RMD160 (cl74unix.tar.gz) = a00a8de15e042080041076fcf3ad2592d9deb469 | | 4 | RMD160 (cl74unix.tar.gz) = a00a8de15e042080041076fcf3ad2592d9deb469 |
5 | Size (cl74unix.tar.gz) = 999170 bytes | | 5 | Size (cl74unix.tar.gz) = 999170 bytes |
6 | SHA1 (patch-aa) = 6d3bc6249267789806ad4eef1b36aa809277a930 | | 6 | SHA1 (patch-aa) = 6d3bc6249267789806ad4eef1b36aa809277a930 |
7 | SHA1 (patch-ab) = 3098db9faa0cd60931c781b4b24f796ac23ef52d | | 7 | SHA1 (patch-ab) = 3098db9faa0cd60931c781b4b24f796ac23ef52d |
8 | SHA1 (patch-ac) = 6b268ddd007f73a8bb4085df4826627425eb9658 | | 8 | SHA1 (patch-ac) = 6b268ddd007f73a8bb4085df4826627425eb9658 |
9 | SHA1 (patch-ad) = 22c97a5a2ee4a45cd85ae4c886b61cdcf833703a | | 9 | SHA1 (patch-ad) = 22c97a5a2ee4a45cd85ae4c886b61cdcf833703a |
10 | SHA1 (patch-ae) = 8de237bfb4b9a1c17e1cf4ad9c4abb7b1b456698 | | 10 | SHA1 (patch-ae) = 800928059c173bdcdf61330118d5da82f6d31e3b |
11 | SHA1 (patch-af) = 196fb2ace8ab078bccb2c8dba8b8cff211e6e95c | | 11 | SHA1 (patch-af) = 196fb2ace8ab078bccb2c8dba8b8cff211e6e95c |
12 | SHA1 (patch-ag) = fce329f96d369f86c6fe7e3a30d78bed003d7043 | | 12 | SHA1 (patch-ag) = fce329f96d369f86c6fe7e3a30d78bed003d7043 |
13 | SHA1 (patch-ah) = 6a83f924ba49ae7121e070dc75432b2009643d9a | | 13 | SHA1 (patch-ah) = 6a83f924ba49ae7121e070dc75432b2009643d9a |
14 | SHA1 (patch-ai) = d9b663b4be634ccb64259c6fe0ddcda193dbbe50 | | 14 | SHA1 (patch-ai) = d9b663b4be634ccb64259c6fe0ddcda193dbbe50 |
15 | SHA1 (patch-aj) = 0e9ebfb02fb5efa06e393cf3e0ea3db6acd56acd | | 15 | SHA1 (patch-aj) = 0e9ebfb02fb5efa06e393cf3e0ea3db6acd56acd |
16 | SHA1 (patch-ak) = c24484f6dc1978c8bd04ff125f6fd86812fe68bc | | 16 | SHA1 (patch-ak) = c24484f6dc1978c8bd04ff125f6fd86812fe68bc |
17 | SHA1 (patch-al) = d4274b118eacf8f6f2a61ddaa8fde7468f45aefc | | 17 | SHA1 (patch-al) = d4274b118eacf8f6f2a61ddaa8fde7468f45aefc |
18 | SHA1 (patch-am) = a158d8553a85467955394b169ace0081eab65317 | | 18 | SHA1 (patch-am) = a158d8553a85467955394b169ace0081eab65317 |
19 | SHA1 (patch-an) = 1bb3d4a32ae15f5639ab7575f50452764cf1d9a5 | | 19 | SHA1 (patch-an) = 1bb3d4a32ae15f5639ab7575f50452764cf1d9a5 |
20 | SHA1 (patch-ao) = 59ec322fd19a9139fd329a9a36c0640a12306adf | | 20 | SHA1 (patch-ao) = 59ec322fd19a9139fd329a9a36c0640a12306adf |
21 | SHA1 (patch-ap) = e573c67efe96d159b3ab5bedc2ca1a319633a227 | | 21 | SHA1 (patch-ap) = e573c67efe96d159b3ab5bedc2ca1a319633a227 |
22 | SHA1 (patch-aq) = 00285a3f4cd6beea7a5b1b8f9c7c6810540dc5d8 | | 22 | SHA1 (patch-aq) = 00285a3f4cd6beea7a5b1b8f9c7c6810540dc5d8 |
23 | SHA1 (patch-ar) = aba9a829916af887d1115b51a57b449aced8535f | | 23 | SHA1 (patch-ar) = aba9a829916af887d1115b51a57b449aced8535f |
24 | SHA1 (patch-as) = 5d462ae1a1bf72ae1a0f19ff73d4b1b4226dbb32 | | 24 | SHA1 (patch-as) = 5d462ae1a1bf72ae1a0f19ff73d4b1b4226dbb32 |
25 | SHA1 (patch-at) = 83c69c1635a0c8f038bcd23d00acc4dc406c0684 | | 25 | SHA1 (patch-at) = 83c69c1635a0c8f038bcd23d00acc4dc406c0684 |
26 | SHA1 (patch-au) = 4fe5ac20d7526e782143874b0ce9c7367716dbce | | 26 | SHA1 (patch-au) = 4fe5ac20d7526e782143874b0ce9c7367716dbce |
27 | SHA1 (patch-yacc_main_c) = 37171cb256ffc85faf4505525ec950d3e31e002c | | 27 | SHA1 (patch-yacc_error.c) = ca57d272ddb1b7d4da6eb501abd687f3426bd8d4 |
| | | 28 | SHA1 (patch-yacc_main_c) = 1a4670c718c4a3ef3e1ace7dd56c2516a8d3fef3 |
| | | 29 | SHA1 (patch-yacc_output.c) = 2490fcf4ae844c31419f771ccef1a272f948bef5 |
| | | 30 | SHA1 (patch-yacc_reader.c) = 5bf63ccb86d9e689cc7320424ab918b5de6f9000 |
| | | 31 | SHA1 (patch-yacc_verbose.c) = 61f3d64819abaf23e02c888ec916c59b29297847 |
--- pkgsrc/lang/caml-light/patches/patch-ae 2008/09/05 02:07:51 1.1
+++ pkgsrc/lang/caml-light/patches/patch-ae 2012/10/20 22:11:30 1.2
| @@ -1,15 +1,24 @@ | | | @@ -1,15 +1,24 @@ |
1 | $NetBSD: patch-ae,v 1.1 2008/09/05 02:07:51 dholland Exp $ | | 1 | $NetBSD: patch-ae,v 1.2 2012/10/20 22:11:30 joerg Exp $ |
2 | | | 2 | |
3 | Fix 64-bit build. | | 3 | Fix 64-bit build. |
4 | | | 4 | |
5 | --- runtime/debugcom.c~ 1997-06-27 09:59:02.000000000 -0400 | | 5 | --- runtime/debugcom.c~ 1997-06-27 09:59:02.000000000 -0400 |
6 | +++ runtime/debugcom.c 2008-09-04 21:11:39.000000000 -0400 | | 6 | +++ runtime/debugcom.c 2008-09-04 21:11:39.000000000 -0400 |
7 | @@ -2,6 +2,8 @@ | | 7 | @@ -2,6 +2,8 @@ |
8 | | | 8 | |
9 | #include <stdio.h> | | 9 | #include <stdio.h> |
10 | #include <string.h> | | 10 | #include <string.h> |
11 | +#include <unistd.h> | | 11 | +#include <unistd.h> |
12 | +#include <arpa/inet.h> /* for inet_addr() */ | | 12 | +#include <arpa/inet.h> /* for inet_addr() */ |
13 | #include "misc.h" | | 13 | #include "misc.h" |
14 | #include "debugger.h" | | 14 | #include "debugger.h" |
15 | #include "mlvalues.h" | | 15 | #include "mlvalues.h" |
| | | 16 | @@ -182,7 +184,7 @@ int debugger(event) |
| | | 17 | value val; |
| | | 18 | value * p; |
| | | 19 | |
| | | 20 | - if (dbg_socket == -1) return; /* Not connected to a debugger. */ |
| | | 21 | + if (dbg_socket == -1) return -1; /* Not connected to a debugger. */ |
| | | 22 | |
| | | 23 | /* Report the event to the debugger */ |
| | | 24 | switch(event) { |
--- pkgsrc/lang/caml-light/patches/patch-yacc_main_c 2011/11/06 19:32:07 1.1
+++ pkgsrc/lang/caml-light/patches/patch-yacc_main_c 2012/10/20 22:11:30 1.2
| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: patch-yacc_main_c,v 1.1 2011/11/06 19:32:07 dholland Exp $ | | 1 | $NetBSD: patch-yacc_main_c,v 1.2 2012/10/20 22:11:30 joerg Exp $ |
2 | | | 2 | |
3 | Avoid insecure use of mktemp(). | | 3 | Avoid insecure use of mktemp(). |
4 | | | 4 | |
5 | --- yacc/main.c~ 1995-06-07 09:34:32.000000000 -0400 | | 5 | --- yacc/main.c~ 1995-06-07 09:34:32.000000000 -0400 |
6 | +++ yacc/main.c 2008-09-04 22:15:26.000000000 -0400 | | 6 | +++ yacc/main.c 2008-09-04 22:15:26.000000000 -0400 |
7 | @@ -1,4 +1,5 @@ | | 7 | @@ -1,4 +1,5 @@ |
8 | #include <signal.h> | | 8 | #include <signal.h> |
9 | +#include <stdlib.h> /* for mkstemp(), getenv() */ | | 9 | +#include <stdlib.h> /* for mkstemp(), getenv() */ |
10 | #include "defs.h" | | 10 | #include "defs.h" |
11 | | | 11 | |
12 | char dflag; | | 12 | char dflag; |
13 | @@ -31,6 +32,11 @@ char *text_file_name; | | 13 | @@ -31,6 +32,11 @@ char *text_file_name; |
14 | char *union_file_name; | | 14 | char *union_file_name; |
| @@ -22,26 +22,35 @@ Avoid insecure use of mktemp(). | | | @@ -22,26 +22,35 @@ Avoid insecure use of mktemp(). |
22 | FILE *action_file; /* a temp file, used to save actions associated */ | | 22 | FILE *action_file; /* a temp file, used to save actions associated */ |
23 | /* with rules until the parser is written */ | | 23 | /* with rules until the parser is written */ |
24 | FILE *entry_file; | | 24 | FILE *entry_file; |
25 | @@ -69,9 +75,6 @@ char *rassoc; | | 25 | @@ -69,9 +75,6 @@ char *rassoc; |
26 | short **derives; | | 26 | short **derives; |
27 | char *nullable; | | 27 | char *nullable; |
28 | | | 28 | |
29 | -extern char *mktemp(); | | 29 | -extern char *mktemp(); |
30 | -extern char *getenv(); | | 30 | -extern char *getenv(); |
31 | - | | 31 | - |
32 | | | 32 | |
33 | done(k) | | 33 | done(k) |
34 | int k; | | 34 | int k; |
| | | 35 | @@ -121,7 +124,7 @@ usage() |
| | | 36 | exit(1); |
| | | 37 | } |
| | | 38 | |
| | | 39 | -getargs(argc, argv) |
| | | 40 | +void getargs(argc, argv) |
| | | 41 | int argc; |
| | | 42 | char *argv[]; |
| | | 43 | { |
35 | @@ -276,12 +279,21 @@ create_file_names() | | 44 | @@ -276,12 +279,21 @@ create_file_names() |
36 | union_file_name[len + 5] = 'u'; | | 45 | union_file_name[len + 5] = 'u'; |
37 | | | 46 | |
38 | #ifndef NO_UNIX | | 47 | #ifndef NO_UNIX |
39 | - mktemp(action_file_name); | | 48 | - mktemp(action_file_name); |
40 | - mktemp(entry_file_name); | | 49 | - mktemp(entry_file_name); |
41 | - mktemp(text_file_name); | | 50 | - mktemp(text_file_name); |
42 | - mktemp(union_file_name); | | 51 | - mktemp(union_file_name); |
43 | + action_fd = mkstemp(action_file_name); | | 52 | + action_fd = mkstemp(action_file_name); |
44 | + entry_fd = mkstemp(entry_file_name); | | 53 | + entry_fd = mkstemp(entry_file_name); |
45 | + text_fd = mkstemp(text_file_name); | | 54 | + text_fd = mkstemp(text_file_name); |
46 | + union_fd = mkstemp(union_file_name); | | 55 | + union_fd = mkstemp(union_file_name); |
47 | #endif | | 56 | #endif |
$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;
{
$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;
{
$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;
$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;