Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add extern definition for ncols and clist[] to sort.h, eliminate extra

Browse Source 
definitions in init.c and field.c
g/c MAXMERGE
This commit is contained in:
jdolecek 2002-12-24 13:20:25 +00:00
parent 2837b28251
commit 9208bb6e3a
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/sort/fields.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fields.c,v 1.10 2001/02/19 20:50:17 jdolecek Exp $ */
/* $NetBSD: fields.c,v 1.11 2002/12/24 13:20:25 jdolecek Exp $ */
/*-
* Copyright (c) 1993
@ -41,7 +41,7 @@
#include "sort.h"
#ifndef lint
__RCSID("$NetBSD: fields.c,v 1.10 2001/02/19 20:50:17 jdolecek Exp $");
__RCSID("$NetBSD: fields.c,v 1.11 2002/12/24 13:20:25 jdolecek Exp $");
__SCCSID("@(#)fields.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@ -59,9 +59,6 @@ __SCCSID("@(#)fields.c 8.1 (Berkeley) 6/6/93");
static u_char *enterfield __P((u_char *, u_char *, struct field *, int));
static u_char *number __P((u_char *, u_char *, u_char *, u_char *, int));
extern struct coldesc clist[(ND+1)*2];
extern int ncols;
#define DECIMAL '.'
#define OFFSET 128

6
usr.bin/sort/init.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: init.c,v 1.6 2001/12/31 18:45:04 thorpej Exp $ */
/* $NetBSD: init.c,v 1.7 2002/12/24 13:20:25 jdolecek Exp $ */
/*-
* Copyright (c) 1993
@ -39,7 +39,7 @@
#include "sort.h"
#ifndef lint
__RCSID("$NetBSD: init.c,v 1.6 2001/12/31 18:45:04 thorpej Exp $");
__RCSID("$NetBSD: init.c,v 1.7 2002/12/24 13:20:25 jdolecek Exp $");
__SCCSID("@(#)init.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
@ -50,8 +50,6 @@ static void insertcol __P((struct field *));
static const char *setcolumn __P((const char *, struct field *, int));
int setfield __P((const char *, struct field *, int));
extern struct coldesc clist[(ND+1)*2];
extern int ncols;
u_char gweights[NBINS];
/*

5
usr.bin/sort/sort.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sort.h,v 1.12 2001/02/19 19:31:29 jdolecek Exp $ */
/* $NetBSD: sort.h,v 1.13 2002/12/24 13:20:25 jdolecek Exp $ */
/*-
* Copyright (c) 1993
@ -50,7 +50,6 @@
#include <string.h>
#define NBINS 256
#define MAXMERGE 16
/* values for masks, weights, and other flags. */
#define I 1 /* mask out non-printable characters */
@ -145,5 +144,7 @@ extern int REC_D;
extern const char *tmpdir;
extern int stable_sort;
extern u_char gweights[NBINS];
extern struct coldesc clist[(ND+1)*2];
extern int ncols;
#include "extern.h"