Mark a bunch of functions as void reflecting the lack of return values.

7 files changed, 189 insertions, 8 deletions

diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index cd87de3a894..250ef9c5156 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/06/05 17:21:48 ghen Exp $
+$NetBSD: distinfo,v 1.12 2012/11/19 03:05:04 joerg Exp $
 
 SHA1 (glimpse-4.18.5.tar.gz) = a7a6168f3decab6cb6c674914259e2cf71be4e40
 RMD160 (glimpse-4.18.5.tar.gz) = c1012980e0e09de9c71e07ffed075817e0814eec
@@ -16,11 +16,15 @@ SHA1 (patch-aj) = e4f8f557f23213f2b2224084b853d1c269caf091
 SHA1 (patch-ak) = 35b637bf404fa0f22d669e922eeb33f7a37010c6
 SHA1 (patch-al) = 84ee54521e8086e83f68a78db40a2d6f0cd86cc9
 SHA1 (patch-am) = 6438bb41b5816d5b7172a20a02472632d0e3bf82
-SHA1 (patch-an) = 898cdfd1d90083c494c15a9c84d8db196a833ae4
-SHA1 (patch-ao) = f1cb44f3d2e940adffe04ebdb7ee149fb9df8a64
+SHA1 (patch-an) = 7ffe1d0528fc7ce4737633ec0270bd3b32714517
+SHA1 (patch-ao) = 3c35916cc59d0e94fd2ad97d39357a20b5990485
 SHA1 (patch-ap) = ff5f0223544631fca4c3fcc9f1448a7c46b818e8
 SHA1 (patch-aq) = b39d669c1a362724668781762376583df6039d87
 SHA1 (patch-ar) = 26be8fc0e9bb75d286ed68451355e8a1c348f43c
 SHA1 (patch-as) = e684ae15474231d103a8341c4d1d68fb035807ee
 SHA1 (patch-at) = 6f4d94c03fe0804e9b4fc240bf1b899e9a4bf4a5
 SHA1 (patch-au) = 12b657e845627f5819711354b73ba3cf213c7434
+SHA1 (patch-compress_main__tbuild.c) = e582a9f0c7bf273b482b6967396a3b2235bc0650
+SHA1 (patch-compress_misc.c) = f585414bca6d6db29a32853146d447154c7e29da
+SHA1 (patch-get__filename.c) = 3ba7e0e2574b416744a3907b261c7048681af4e5
+SHA1 (patch-index_io.c) = 375697d29b0a0272204437a25b03086734dbffec
diff --git a/textproc/glimpse/patches/patch-an b/textproc/glimpse/patches/patch-an
index 74a2a4dc9aa..4d5d9296808 100644
--- a/textproc/glimpse/patches/patch-an
+++ b/textproc/glimpse/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2005/06/04 10:44:29 wiz Exp $
+$NetBSD: patch-an,v 1.2 2012/11/19 03:05:04 joerg Exp $
 
---- get_index.c.orig	2002-09-27 23:41:07.000000000 +0200
+--- get_index.c.orig	2002-09-27 21:41:07.000000000 +0000
 +++ get_index.c
 @@ -15,7 +15,9 @@ extern	int	WHOLEFILESCOPE;
  extern	unsigned int *dest_index_set;
@@ -12,3 +12,19 @@ $NetBSD: patch-an,v 1.1 2005/06/04 10:44:29 wiz Exp $
  extern	int	ByteLevelIndex;
  extern  int	RecordLevelIndex;
  extern  int	rdelim_len;
+@@ -53,6 +55,7 @@ free_list(p1)
+ }
+ 
+ /* Unions offset lists list2 with list1 sorted in increasing order (deletes elements from list2) => changes both list1 and list2: f += #elems added */
++void
+ sorted_union(list1, list2, f, pf, cf)
+ 	struct offsets **list1, **list2;
+ 	int	*f, pf, cf;
+@@ -115,6 +118,7 @@ sorted_union(list1, list2, f, pf, cf)
+ }
+ 
+ /* Intersects offset lists list2 with list1 sorted in increasing order (deletes elements from list2) => changes both list1 and list2 */
++void
+ sorted_intersection(filenum, list1, list2, f)
+ 	struct offsets **list1, **list2;
+ 	int	*f;
diff --git a/textproc/glimpse/patches/patch-ao b/textproc/glimpse/patches/patch-ao
index c2cd2b3072e..04b4eb4e8c8 100644
--- a/textproc/glimpse/patches/patch-ao
+++ b/textproc/glimpse/patches/patch-ao
@@ -1,8 +1,28 @@
-$NetBSD: patch-ao,v 1.1 2005/06/04 10:44:29 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2012/11/19 03:05:04 joerg Exp $
 
---- index/build_in.c.orig	2002-10-11 07:28:32.000000000 +0200
+--- index/build_in.c.orig	2002-10-11 05:28:32.000000000 +0000
 +++ index/build_in.c
-@@ -605,7 +605,9 @@ traverse1()
+@@ -125,6 +125,12 @@ extern struct  indices *ip;
+ extern int HashTableSize;
+ struct token **hash_table; /*[MAX_64K_HASH];*/
+ 
++void remove_filename(int fileindex, int new_partition);
++void merge_in(FILE *f1, FILE *f2, FILE *f3);
++void init_hash_table(void);
++void build_hash(void);
++
++void
+ build_index()
+ {
+ 	int	i;
+@@ -599,13 +605,16 @@ next_token:
+ #endif
+ }
+ 
++void
+ traverse1()
+ {
+     FILE *i1, *i2, *i3;
      int ret;
      char s[MAX_LINE_LEN], es1[MAX_LINE_LEN], es2[MAX_LINE_LEN], es3[MAX_LINE_LEN];
      char s1[MAX_LINE_LEN];
@@ -12,3 +32,45 @@ $NetBSD: patch-ao,v 1.1 2005/06/04 10:44:29 wiz Exp $
      static int maxsortlinelen = 0;
      int	i;
  
+@@ -781,7 +790,8 @@ build_hash():
+ input: a set of filenames in name_list[], a partition table p_table[]
+ output: a hash table hash_table[].
+ -----------------------------------------------------------------------*/
+-build_hash()
++void
++build_hash(void)
+ {
+     int	fd;                          /* opened file number */
+     int  i, pn;                  /* pn: current partition */
+@@ -1230,7 +1240,8 @@ try_again_1:
+     my_free(buffer_begin, BLOCK_SIZE + 10);
+ }
+ 
+-init_hash_table()
++void
++init_hash_table(void)
+ {
+     int i;
+ 
+@@ -1481,8 +1492,8 @@ extern unsigned char *dest_index_buf;
+ extern unsigned char *merge_index_buf;
+ 
+ /* merge index file f1 and f2, then put the result in index file f3 */
+-merge_in(f1, f2, f3)
+-FILE *f1, *f2, *f3;
++void
++merge_in(FILE *f1, FILE *f2, FILE *f3)
+ {
+     int src_mark, dest_mark;
+     int	src_num, dest_num;
+@@ -1895,8 +1906,8 @@ fprintf(stderr,"Realloc #4, new size is 
+     return;
+ }
+ 
+-remove_filename(fileindex, new_partition)
+-	int	fileindex, new_partition;
++void
++remove_filename(int fileindex, int new_partition)
+ {
+ 	if ((fileindex < 0) || (fileindex >= MaxNum24bPartition)) return;
+ #if	BG_DEBUG
diff --git a/textproc/glimpse/patches/patch-compress_main__tbuild.c b/textproc/glimpse/patches/patch-compress_main__tbuild.c
new file mode 100644
index 00000000000..db2c72a0a7e
--- /dev/null
+++ b/textproc/glimpse/patches/patch-compress_main__tbuild.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-compress_main__tbuild.c,v 1.1 2012/11/19 03:05:04 joerg Exp $
+
+--- compress/main_tbuild.c.orig	2012-11-19 01:18:30.000000000 +0000
++++ compress/main_tbuild.c
+@@ -25,7 +25,7 @@ char	*progname;
+ int
+ main(argc, argv)
+ 	int	argc;
+-	unsigned char	*argv[];
++	char	*argv[];
+ {
+ 	char	comp_dir[MAX_LINE_LEN];
+ 	int	threshold, specialwords;
diff --git a/textproc/glimpse/patches/patch-compress_misc.c b/textproc/glimpse/patches/patch-compress_misc.c
new file mode 100644
index 00000000000..9a42fcdd2f7
--- /dev/null
+++ b/textproc/glimpse/patches/patch-compress_misc.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-compress_misc.c,v 1.1 2012/11/19 03:05:04 joerg Exp $
+
+--- compress/misc.c.orig	2012-11-18 22:59:30.000000000 +0000
++++ compress/misc.c
+@@ -288,6 +288,7 @@ int	flags;
+ 	return 1;
+ }
+ 
++void
+ uninitialize_common()
+ {
+ 	initialize_common_done = 0;
diff --git a/textproc/glimpse/patches/patch-get__filename.c b/textproc/glimpse/patches/patch-get__filename.c
new file mode 100644
index 00000000000..d0c137e7263
--- /dev/null
+++ b/textproc/glimpse/patches/patch-get__filename.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-get__filename.c,v 1.1 2012/11/19 03:05:04 joerg Exp $
+
+--- get_filename.c.orig	2012-11-18 22:58:10.000000000 +0000
++++ get_filename.c
+@@ -481,6 +481,7 @@ endofinput:
+ 	return 0;
+ }
+ 
++void
+ get_filenames(index_vect, argc, argv, dummylen, dummypat, file_num)
+ int  *index_vect;
+ int argc; /* the arguments to agrep for -F */
diff --git a/textproc/glimpse/patches/patch-index_io.c b/textproc/glimpse/patches/patch-index_io.c
new file mode 100644
index 00000000000..db25f5268bc
--- /dev/null
+++ b/textproc/glimpse/patches/patch-index_io.c
@@ -0,0 +1,62 @@
+$NetBSD: patch-index_io.c,v 1.1 2012/11/19 03:05:04 joerg Exp $
+
+--- index/io.c.orig	2012-11-18 22:53:18.000000000 +0000
++++ index/io.c
+@@ -365,7 +365,7 @@ static int copy_file(const char *source,
+ 
+ 
+ 
+-
++void
+ read_filters(index_dir, dofilter)
+ char	*index_dir;
+ int	dofilter;
+@@ -1460,6 +1460,7 @@ get_filename_index(name)
+ 	return e->index;
+ }
+ 
++void
+ insert_filename(name, name_index)
+ 	char	*name;
+ 	int	name_index;
+@@ -1512,6 +1513,7 @@ insert_filename(name, name_index)
+ 	(*pe)->index = name_index;
+ }
+ 
++void
+ change_filename(name, len, index, newname)
+ 	char	*name;
+ 	int	len;
+@@ -1534,6 +1536,7 @@ change_filename(name, len, index, newnam
+ 	return;
+ }
+ 
++void
+ delete_filename(name, name_index)
+ 	char	*name;
+ 	int	name_index;
+@@ -1577,6 +1580,7 @@ delete_filename(name, name_index)
+ 	return;
+ }
+ 
++void
+ init_filename_hashtable()
+ {
+ 	int	i;
+@@ -1584,6 +1588,8 @@ init_filename_hashtable()
+ }
+ 
+ int	built_filename_hashtable = 0;
++
++void
+ build_filename_hashtable(names, num)
+ 	char	**names[];
+ 	int	num;
+@@ -1595,6 +1601,7 @@ build_filename_hashtable(names, num)
+ 	built_filename_hashtable = 1;
+ }
+ 
++void
+ destroy_filename_hashtable()
+ {
+ 	int	i;