d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Remove #define MKINIT.

Browse Source 
MKINIT only served for the removed mkinit. Many variables can be static now.
This commit is contained in:
jilles 2013-07-25 19:48:15 +00:00
parent d1aa5826fa
commit 45d56acf59
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/sh/eval.c
View File

@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
int evalskip; /* set if we are skipping commands */
int skipcount; /* number of levels to skip */
MKINIT int loopnest; /* current loop nesting level */
static int loopnest; /* current loop nesting level */
int funcnest; /* depth of function calls */
static int builtin_flags; /* evalcommand flags for builtins */

2
bin/sh/input.c
View File

@ -92,7 +92,7 @@ struct parsefile {
int plinno = 1; /* input line number */
int parsenleft; /* copy of parsefile->nleft */
MKINIT int parselleft; /* copy of parsefile->lleft */
static int parselleft; /* copy of parsefile->lleft */
const char *parsenextc; /* copy of parsefile->nextc */
static char basebuf[BUFSIZ + 1];/* buffer for top level input file */
static struct parsefile basepf = { /* top level input file */

6
bin/sh/jobs.c
View File

@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
static struct job *jobtab; /* array of jobs */
static int njobs; /* size of array */
MKINIT pid_t backgndpid = -1; /* pid of last background process */
MKINIT struct job *bgjob = NULL; /* last background process */
static pid_t backgndpid = -1; /* pid of last background process */
static struct job *bgjob = NULL; /* last background process */
#if JOBS
static struct job *jobmru; /* most recently used job list */
static pid_t initialpgrp; /* pgrp of shell on invocation */
@ -116,7 +116,7 @@ static void showjob(struct job *, int);
* Turn job control on and off.
*/
MKINIT int jobctl;
static int jobctl;
#if JOBS
void

4
bin/sh/parser.c
View File

@ -96,9 +96,9 @@ static struct heredoc *heredoclist; /* list of here documents to read */
static int doprompt; /* if set, prompt the user */
static int needprompt; /* true if interactive and at start of line */
static int lasttoken; /* last token read */
MKINIT int tokpushback; /* last token pushed back */
int tokpushback; /* last token pushed back */
static char *wordtext; /* text of last word returned by readtoken */
MKINIT int checkkwd; /* 1 == check for kwds, 2 == also eat newlines */
static int checkkwd; /* 1 == check for kwds, 2 == also eat newlines */
static struct nodelist *backquotelist;
static union node *redirnode;
static struct heredoc *heredoc;

3
bin/sh/redir.c
View File

@ -66,14 +66,13 @@ __FBSDID("$FreeBSD$");
#define CLOSED -1 /* fd was not open before redir */
MKINIT
struct redirtab {
struct redirtab *next;
int renamed[10];
};
MKINIT struct redirtab *redirlist;
static struct redirtab *redirlist;
/*
* We keep track of whether or not fd0 has been redirected. This is for

1
bin/sh/shell.h
View File

@ -63,7 +63,6 @@ typedef intmax_t arith_t;
#define ARITH_MAX INTMAX_MAX
typedef void *pointer;
#define MKINIT /* empty */
#include <sys/cdefs.h>

2
bin/sh/trap.c
View File

@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
#define S_RESET 5 /* temporary - to reset a hard ignored sig */
MKINIT char sigmode[NSIG]; /* current value of signal */
static char sigmode[NSIG]; /* current value of signal */
volatile sig_atomic_t pendingsig; /* indicates some signal received */
int in_dotrap; /* do we execute in a trap handler? */
static char *volatile trap[NSIG]; /* trap handler commands */