diff options
author | dholland <dholland@pkgsrc.org> | 2011-09-04 01:22:04 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2011-09-04 01:22:04 +0000 |
commit | 01003f7c402be57bd63ae5e07eafbbebb92efeb8 (patch) | |
tree | 730ce6708160c97de09c406e344b5e68c84b9d24 | |
parent | 89c335ff642572ba6e82d36c586fe565a6c30de5 (diff) | |
download | pkgsrc-01003f7c402be57bd63ae5e07eafbbebb92efeb8.tar.gz |
Fix return types for ancient code that doesn't know about "void", because
clang objects. Other half of last weekend's patch, which I apparently
erased by accident (or something) before committing.
While here also patch up some illegal type mixing in tr2.c that gcc
warns about.
-rw-r--r-- | archivers/squsq/distinfo | 5 | ||||
-rw-r--r-- | archivers/squsq/patches/patch-aa | 37 | ||||
-rw-r--r-- | archivers/squsq/patches/patch-tr2_c | 33 |
3 files changed, 69 insertions, 6 deletions
diff --git a/archivers/squsq/distinfo b/archivers/squsq/distinfo index f41115e0c6a..f8d9ee7a8c0 100644 --- a/archivers/squsq/distinfo +++ b/archivers/squsq/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2011/08/28 20:41:47 dholland Exp $ +$NetBSD: distinfo,v 1.6 2011/09/04 01:22:04 dholland Exp $ SHA1 (t20-squsq-3.3.tar.gz) = f27ab585803e97f17aa778893606c140ca26ed8b RMD160 (t20-squsq-3.3.tar.gz) = 0acd9c5329cc8b7b4059d1d30cdc9e9c5ece4727 Size (t20-squsq-3.3.tar.gz) = 14654 bytes -SHA1 (patch-aa) = 3939106f89c5b0848f712de9b1768634b5c15285 +SHA1 (patch-aa) = f9536fac9f28fcf4fc23992ffd499efe3bfe52ed SHA1 (patch-sq_c) = b33b322fdd357f87f3e50d667cf1148ef60bdc79 +SHA1 (patch-tr2_c) = 5eb3050d1d79385c9eed2efd0ece3b1c8d658932 diff --git a/archivers/squsq/patches/patch-aa b/archivers/squsq/patches/patch-aa index 6c08acc3424..b97d590e715 100644 --- a/archivers/squsq/patches/patch-aa +++ b/archivers/squsq/patches/patch-aa @@ -1,8 +1,37 @@ -$NetBSD: patch-aa,v 1.1 2001/09/15 21:44:45 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2011/09/04 01:22:04 dholland Exp $ ---- usq.c.orig Sun Jan 17 01:54:04 1988 +Fix function return types. +Fix invalid cpp usage. + +--- usq.c.orig 1988-01-17 00:54:04.000000000 +0000 +++ usq.c -@@ -215,7 +215,7 @@ +@@ -62,6 +62,9 @@ + + #define VERSION "3.3 10/29/86" + ++void obey(char *p); ++void unsqueeze(char *infile); ++ + /* This must follow all include files */ + unsigned int dispcnt; /* How much of each file to preview */ + char ffflag; /* should formfeed separate preview from different files */ +@@ -107,6 +110,7 @@ char *argv[]; + + /* ejecteject */ + ++void + obey(p) + char *p; + { +@@ -153,6 +157,7 @@ char *p; + + /* ejecteject */ + ++void + unsqueeze(infile) + char *infile; + { +@@ -215,7 +220,7 @@ char *infile; goto closein; } @@ -11,7 +40,7 @@ $NetBSD: patch-aa,v 1.1 2001/09/15 21:44:45 wiz Exp $ filecrc = getx16(inbuff); #else filecrc = getw16(inbuff); -@@ -239,7 +239,7 @@ +@@ -239,7 +244,7 @@ char *infile; printf("%s -> %s: ", infile, outfile); #endif diff --git a/archivers/squsq/patches/patch-tr2_c b/archivers/squsq/patches/patch-tr2_c new file mode 100644 index 00000000000..8213bf6f2a4 --- /dev/null +++ b/archivers/squsq/patches/patch-tr2_c @@ -0,0 +1,33 @@ +$NetBSD: patch-tr2_c,v 1.1 2011/09/04 01:22:04 dholland Exp $ + +Don't use NULL as an integer zero. + +--- tr2.c~ 1986-12-31 04:02:20.000000000 +0000 ++++ tr2.c +@@ -321,7 +321,7 @@ init_enc() + * Returns ERROR if codes are too long. + */ + +-int /* returns ERROR or NULL */ ++int /* returns ERROR or FALSE */ + buildenc(level, root) + int level;/* level of tree being examined, from zero */ + int root; /* root of subtree is also data value if leaf */ +@@ -347,7 +347,7 @@ int root; /* root of subtree is also dat + #ifdef DEBUG + if (debug) printf(" codelen[%d]=%d,code[%d]=%02x\n",root,codelen[root],root,code[root]); + #endif +- return ((level > 16) ? ERROR : NULL); ++ return ((level > 16) ? ERROR : FALSE); + } else { + if( l != NOCHILD) { + /* Clear path bit and continue deeper */ +@@ -364,7 +364,7 @@ int root; /* root of subtree is also dat + return (ERROR); + } + } +- return (NULL); /* if we got here we're ok so far */ ++ return (FALSE); /* if we got here we're ok so far */ + } + /* */ + /* Write out the header of the compressed file */ |