Module Name: src
Committed By: asau
Date: Sun Mar 1 01:07:46 UTC 2015
Modified Files:
src/usr.bin/sed: extern.h process.c
Log Message:
Hide more subroutines in processing phase.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/sed/extern.h
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/sed/process.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/sed/extern.h
diff -u src/usr.bin/sed/extern.h:1.18 src/usr.bin/sed/extern.h:1.19
--- src/usr.bin/sed/extern.h:1.18 Sun Mar 1 01:00:07 2015
+++ src/usr.bin/sed/extern.h Sun Mar 1 01:07:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.18 2015/03/01 01:00:07 asau Exp $ */
+/* $NetBSD: extern.h,v 1.19 2015/03/01 01:07:46 asau Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -63,9 +63,7 @@ extern int ispan;
extern int rflags; /* regex flags to use */
void compile(void);
-void cspace(SPACE *, const char *, size_t, enum e_spflag);
int process(void);
-void resetstate(void);
char *strregerror(int, regex_t *);
void *xmalloc(size_t);
void *xrealloc(void *, size_t);
Index: src/usr.bin/sed/process.c
diff -u src/usr.bin/sed/process.c:1.50 src/usr.bin/sed/process.c:1.51
--- src/usr.bin/sed/process.c:1.50 Sun Mar 1 01:00:07 2015
+++ src/usr.bin/sed/process.c Sun Mar 1 01:07:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: process.c,v 1.50 2015/03/01 01:00:07 asau Exp $ */
+/* $NetBSD: process.c,v 1.51 2015/03/01 01:07:46 asau Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: process.c,v 1.50 2015/03/01 01:00:07 asau Exp $");
+__RCSID("$NetBSD: process.c,v 1.51 2015/03/01 01:07:46 asau Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/process.c 192732 2009-05-25 06:45:33Z brian $");
#endif
@@ -81,11 +81,13 @@ static int lastline(void);
static __inline int applies(struct s_command *);
static void cfclose(struct s_command *, struct s_command *);
+static void cspace(SPACE *, const char *, size_t, enum e_spflag);
static void do_tr(struct s_tr *);
static void flush_appends(void);
static void lputs(char *, size_t);
static __inline int regexec_e(regex_t *, const char *, int, int, size_t);
static void regsub(SPACE *, char *, char *);
+static void resetstate(void);
static int substitute(struct s_command *);
static FILE *infile; /* Current input file */
@@ -375,7 +377,7 @@ applies(struct s_command *cp)
/*
* Reset the sed processor to its initial state.
*/
-void
+static void
resetstate(void)
{
struct s_command *cp;
@@ -774,7 +776,7 @@ regsub(SPACE *sp, char *string, char *sr
* Concatenate space: append the source space to the destination space,
* allocating new space as necessary.
*/
-void
+static void
cspace(SPACE *sp, const char *p, size_t len, enum e_spflag spflag)
{
size_t tlen;
