Skip to content

Commit

Permalink
Fix several warnings.
Browse files Browse the repository at this point in the history
- Add __unused keywords.
- Don't shadow a global variable called cr.
- Make the global cr variable const.
  • Loading branch information
Ed Schouten authored and Ed Schouten committed Jan 2, 2010
1 parent 8ba6b16 commit 3e08d55
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions libexec/comsat/comsat.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void onalrm(int);
void reapchildren(int);

int
main(int argc, char *argv[])
main(int argc __unused, char *argv[] __unused)
{
struct sockaddr_in from;
socklen_t fromlen;
Expand Down Expand Up @@ -132,16 +132,16 @@ main(int argc, char *argv[])
}

void
reapchildren(int signo)
reapchildren(int signo __unused)
{
while (wait3(NULL, WNOHANG, NULL) > 0);
}

void
onalrm(int signo)
onalrm(int signo __unused)
{
static u_int utmpsize; /* last malloced size for utmp */
static u_int utmpmtime; /* last modification time for utmp */
static off_t utmpsize; /* last malloced size for utmp */
static time_t utmpmtime; /* last modification time for utmp */
struct stat statbf;

if (time(NULL) - lastmsgtime >= MAXIDLE)
Expand Down Expand Up @@ -194,7 +194,7 @@ mailfor(char *name)
notify(utp, file, offset, folder);
}

static char *cr;
static const char *cr;

void
notify(struct utmp *utp, char file[], off_t offset, int folder)
Expand All @@ -203,11 +203,11 @@ notify(struct utmp *utp, char file[], off_t offset, int folder)
struct stat stb;
struct termios tio;
char tty[20], name[sizeof(utmp[0].ut_name) + 1];
const char *cr = utp->ut_line;
const char *line = utp->ut_line;

if (strncmp(cr, "pts/", 4) == 0)
cr += 4;
if (strchr(cr, '/')) {
if (strncmp(line, "pts/", 4) == 0)
line += 4;
if (strchr(line, '/')) {
/* A slash is an attempt to break security... */
syslog(LOG_AUTH | LOG_NOTICE, "Unexpected `/' in `%s'",
utp->ut_line);
Expand Down

0 comments on commit 3e08d55

Please sign in to comment.