CVS commit: src/usr.bin/sort

[David Laight]

Module Name:    src
Committed By:   dsl
Date:           Sat Aug 15 16:10:40 UTC 2009

Modified Files:
        src/usr.bin/sort: files.c

Log Message:
Remove the unused 'DBT *key' parameter from seq().


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/sort/files.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/sort/files.c
diff -u src/usr.bin/sort/files.c:1.29 src/usr.bin/sort/files.c:1.30
--- src/usr.bin/sort/files.c:1.29	Sat Aug 15 14:31:48 2009
+++ src/usr.bin/sort/files.c	Sat Aug 15 16:10:40 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: files.c,v 1.29 2009/08/15 14:31:48 dsl Exp $	*/
+/*	$NetBSD: files.c,v 1.30 2009/08/15 16:10:40 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -65,13 +65,13 @@
 #include "fsort.h"
 
 #ifndef lint
-__RCSID("$NetBSD: files.c,v 1.29 2009/08/15 14:31:48 dsl Exp $");
+__RCSID("$NetBSD: files.c,v 1.30 2009/08/15 16:10:40 dsl Exp $");
 __SCCSID("@(#)files.c	8.1 (Berkeley) 6/6/93");
 #endif /* not lint */
 
 #include <string.h>
 
-static int	seq(FILE *, DBT *, DBT *);
+static int	seq(FILE *, DBT *);
 
 /*
  * this is the subroutine for file management for fsort().
@@ -235,7 +235,7 @@
 {
 	static int filenum = 0;
 	static FILE *dbdesc = 0;
-	static DBT dbkey[1], line[1];
+	static DBT line[1];
 	static int overflow = 0;
 	int c;
 
@@ -260,7 +260,7 @@
 				err(2, "%s", filelist->names[filenum]);
 			filenum++;
 		}
-		if (!(c = seq(dbdesc, line, dbkey))) {
+		if (!(c = seq(dbdesc, line))) {
 			if ((signed)line->size > bufend - recbuf->data) {
 				overflow = 1;
 			} else {
@@ -286,10 +286,10 @@
 }
 
 /*
- * get a key/line pair from fp
+ * get a line pair from fp
  */
 static int
-seq(FILE *fp, DBT *line, DBT *key)
+seq(FILE *fp, DBT *line)
 {
 	static u_char *buf, flag = 1;
 	u_char *end, *pos;