Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8717 autofs: parameter/variable set but not used
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Dan McDonald <danmcd@joyent.com>
  • Loading branch information
tsoome authored and Dan McDonald committed Oct 17, 2017
1 parent 7d0b359 commit 64ab327
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
3 changes: 0 additions & 3 deletions usr/src/cmd/fs.d/autofs/autod_nfs.c
Expand Up @@ -3982,7 +3982,6 @@ trace_host_cache()
static void
read_default_nfs(void)
{
static time_t lastread = 0;
struct stat buf;
char defval[4];
int errno, bufsz;
Expand Down Expand Up @@ -4010,8 +4009,6 @@ read_default_nfs(void)
}
}

lastread = buf.st_mtime;

/*
* Quick sanity check on the values picked up from the
* defaults file. Make sure that a mistake wasn't
Expand Down
15 changes: 5 additions & 10 deletions usr/src/cmd/fs.d/autofs/ns_files.c
Expand Up @@ -25,8 +25,6 @@
* Use is subject to license terms.
*/

#pragma ident "%Z%%M% %I% %E% SMI"

#include <stdio.h>
#include <stdlib.h>
#include <syslog.h>
Expand All @@ -50,8 +48,7 @@

static int read_execout(char *key, char **lp, char *fname, char *line,
int linesz);
static int call_read_execout(char *key, char **lp, char *fname, char *line,
int linesz);
static int call_read_execout(char *key, char *fname, char *line, int linesz);
static FILE *file_open(char *, char *, char **, char ***);

/*
Expand Down Expand Up @@ -116,7 +113,7 @@ getmapent_files(key, mapname, ml, stack, stkptr, iswildcard, isrestricted)
fname, key);
}

rc = call_read_execout(key, &lp, fname, ml->linebuf, LINESZ);
rc = call_read_execout(key, fname, ml->linebuf, LINESZ);

if (rc != 0) {
nserr = __NSW_UNAVAIL;
Expand Down Expand Up @@ -648,7 +645,7 @@ read_execout(char *key, char **lp, char *fname, char *line, int linesz)

void
automountd_do_exec_map(void *cookie, char *argp, size_t arg_size,
door_desc_t *dfd, uint_t n_desc)
door_desc_t *dfd, uint_t n_desc)
{
command_t *command;
char line[LINESZ];
Expand Down Expand Up @@ -680,9 +677,8 @@ automountd_do_exec_map(void *cookie, char *argp, size_t arg_size,
door_return(NULL, 0, NULL, 0);
}

int
call_read_execout(char *key, char **lp, char *fname, char *line,
int linesz)
static int
call_read_execout(char *key, char *fname, char *line, int linesz)
{
command_t command;
door_arg_t darg;
Expand All @@ -703,6 +699,5 @@ call_read_execout(char *key, char **lp, char *fname, char *line,

ret = door_call(did_exec_map, &darg);

lp = &line;
return (ret);
}

0 comments on commit 64ab327

Please sign in to comment.