summaryrefslogtreecommitdiffstats
path: root/bin/sh/jobs.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2010-10-13 22:18:03 +0000
committerobrien <obrien@FreeBSD.org>2010-10-13 22:18:03 +0000
commit08b8d916b5887267ef963fd711f1e65b7d8378ac (patch)
treee6aebfbd6fc9b05a3d5978a6cd639a9acb7a748a /bin/sh/jobs.c
parent67f7009c396ada7a6c986ffb8369f851e1063b6f (diff)
downloadFreeBSD-src-08b8d916b5887267ef963fd711f1e65b7d8378ac.zip
FreeBSD-src-08b8d916b5887267ef963fd711f1e65b7d8378ac.tar.gz
In the spirit of r90111, depend on c89 and remove the "STATIC" macro
and its usage.
Diffstat (limited to 'bin/sh/jobs.c')
-rw-r--r--bin/sh/jobs.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 7540742..bd01e5df 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -86,21 +86,21 @@ volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */
static int ttyfd = -1;
#if JOBS
-STATIC void restartjob(struct job *);
+static void restartjob(struct job *);
#endif
-STATIC void freejob(struct job *);
-STATIC struct job *getjob(char *);
-STATIC pid_t dowait(int, struct job *);
-STATIC pid_t waitproc(int, int *);
-STATIC void checkzombies(void);
-STATIC void cmdtxt(union node *);
-STATIC void cmdputs(const char *);
+static void freejob(struct job *);
+static struct job *getjob(char *);
+static pid_t dowait(int, struct job *);
+static pid_t waitproc(int, int *);
+static void checkzombies(void);
+static void cmdtxt(union node *);
+static void cmdputs(const char *);
#if JOBS
-STATIC void setcurjob(struct job *);
-STATIC void deljob(struct job *);
-STATIC struct job *getcurjob(struct job *);
+static void setcurjob(struct job *);
+static void deljob(struct job *);
+static struct job *getcurjob(struct job *);
#endif
-STATIC void showjob(struct job *, pid_t, int);
+static void showjob(struct job *, pid_t, int);
/*
@@ -242,7 +242,7 @@ bgcmd(int argc, char **argv)
}
-STATIC void
+static void
restartjob(struct job *jp)
{
struct procstat *ps;
@@ -301,7 +301,7 @@ jobscmd(int argc, char *argv[])
return (0);
}
-STATIC void
+static void
showjob(struct job *jp, pid_t pid, int mode)
{
char s[64];
@@ -430,7 +430,7 @@ showjobs(int change, int mode)
* Mark a job structure as unused.
*/
-STATIC void
+static void
freejob(struct job *jp)
{
struct procstat *ps;
@@ -543,7 +543,7 @@ jobidcmd(int argc __unused, char **argv)
* Convert a job name to a job structure.
*/
-STATIC struct job *
+static struct job *
getjob(char *name)
{
int jobno;
@@ -686,7 +686,7 @@ makejob(union node *node __unused, int nprocs)
}
#if JOBS
-STATIC void
+static void
setcurjob(struct job *cj)
{
struct job *jp, *prev;
@@ -706,7 +706,7 @@ setcurjob(struct job *cj)
jobmru = cj;
}
-STATIC void
+static void
deljob(struct job *j)
{
struct job *jp, *prev;
@@ -726,7 +726,7 @@ deljob(struct job *j)
* Return the most recently used job that isn't `nj', and preferably one
* that is stopped.
*/
-STATIC struct job *
+static struct job *
getcurjob(struct job *nj)
{
struct job *jp;
@@ -950,7 +950,7 @@ waitforjob(struct job *jp, int *origstatus)
* Wait for a process to terminate.
*/
-STATIC pid_t
+static pid_t
dowait(int block, struct job *job)
{
pid_t pid;
@@ -1061,7 +1061,7 @@ dowait(int block, struct job *job)
* stopped processes. If block is zero, we return a value of zero
* rather than blocking.
*/
-STATIC pid_t
+static pid_t
waitproc(int block, int *status)
{
int flags;
@@ -1102,7 +1102,7 @@ stoppedjobs(void)
}
-STATIC void
+static void
checkzombies(void)
{
while (njobs > 0 && dowait(0, NULL) > 0)
@@ -1147,7 +1147,7 @@ commandtext(union node *n)
}
-STATIC void
+static void
cmdtxt(union node *n)
{
union node *np;
@@ -1280,7 +1280,7 @@ redir:
-STATIC void
+static void
cmdputs(const char *s)
{
const char *p;
OpenPOWER on IntegriCloud