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

cosmetic change: make setcolumn() static, remove bogus redundant setcolumn() prototype

Browse Source 
inside setcolumn() function, constify
This commit is contained in:
jdolecek 2000-10-16 21:41:05 +00:00
parent 8fdd463e7a
commit a65a3ad759
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: init.c,v 1.2 2000/10/07 18:37:10 bjh21 Exp $ */ /* $NetBSD: init.c,v 1.3 2000/10/16 21:41:05 jdolecek Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -39,7 +39,7 @@
#include "sort.h" #include "sort.h"
#ifndef lint #ifndef lint
__RCSID("$NetBSD: init.c,v 1.2 2000/10/07 18:37:10 bjh21 Exp $"); __RCSID("$NetBSD: init.c,v 1.3 2000/10/16 21:41:05 jdolecek Exp $");
__SCCSID("@(#)init.c 8.1 (Berkeley) 6/6/93"); __SCCSID("@(#)init.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */ #endif /* not lint */
@ -47,8 +47,8 @@ __SCCSID("@(#)init.c 8.1 (Berkeley) 6/6/93");
#include <string.h> #include <string.h>
static void insertcol __P((struct field *)); static void insertcol __P((struct field *));
char *setcolumn __P((char *, struct field *, int)); static const char *setcolumn __P((const char *, struct field *, int));
int setfield __P((char *, struct field *, int)); int setfield __P((const char *, struct field *, int));
extern struct coldesc clist[(ND+1)*2]; extern struct coldesc clist[(ND+1)*2];
extern int ncols; extern int ncols;
@ -110,9 +110,9 @@ fldreset(fldtab)
/* /*
* interprets a column in a -k field * interprets a column in a -k field
*/ */
char * static const char *
setcolumn(pos, cur_fld, gflag) setcolumn(pos, cur_fld, gflag)
char *pos; const char *pos;
struct field *cur_fld; struct field *cur_fld;
int gflag; int gflag;
{ {
@ -147,13 +147,12 @@ setcolumn(pos, cur_fld, gflag)
int int
setfield(pos, cur_fld, gflag) setfield(pos, cur_fld, gflag)
char *pos; const char *pos;
struct field *cur_fld; struct field *cur_fld;
int gflag; int gflag;
{ {
static int nfields = 0; static int nfields = 0;
int tmp; int tmp;
char *setcolumn __P((char *, struct field *, int));
if (++nfields == ND) if (++nfields == ND)
errx(2, "too many sort keys. (Limit is %d)", ND-1); errx(2, "too many sort keys. (Limit is %d)", ND-1);
cur_fld->weights = ascii; cur_fld->weights = ascii;