From 389962a6b2a80306c4329dc27f84101cc85415db Mon Sep 17 00:00:00 2001 From: henning <> Date: Wed, 10 Nov 2004 11:27:54 +0000 Subject: [PATCH] const'ify conffile From: Joerg Sonnenberger --- src/usr.sbin/ntpd/ntpd.c | 4 ++-- src/usr.sbin/ntpd/ntpd.h | 4 ++-- src/usr.sbin/ntpd/parse.y | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c index 99f035cf..6b6b0ca5 100644 --- a/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.c,v 1.23 2004/11/04 23:04:22 henning Exp $ */ +/* $OpenBSD: ntpd.c,v 1.24 2004/11/10 11:27:54 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -81,7 +81,7 @@ main(int argc, char *argv[]) struct ntpd_conf conf; struct pollfd pfd[POLL_MAX]; pid_t chld_pid = 0, pid; - char *conffile; + const char *conffile; int ch, nfds, timeout = INFTIM; int pipe_chld[2]; diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h index aadfd72b..9d5b367a 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.h,v 1.41 2004/10/22 21:17:37 henning Exp $ */ +/* $OpenBSD: ntpd.h,v 1.42 2004/11/10 11:27:54 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -210,7 +210,7 @@ void ntp_settime(double); void ntp_host_dns(char *, u_int32_t); /* parse.y */ -int parse_config(char *, struct ntpd_conf *); +int parse_config(const char *, struct ntpd_conf *); /* config.c */ int host(const char *, struct ntp_addr **); diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y index 7d4288a2..0bc05c6e 100644 --- a/src/usr.sbin/ntpd/parse.y +++ b/src/usr.sbin/ntpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.22 2004/11/05 14:28:29 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.23 2004/11/10 11:27:54 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer @@ -39,7 +39,7 @@ static struct ntpd_conf *conf; static FILE *fin = NULL; static int lineno = 1; static int errors = 0; -char *infile; +const char *infile; int yyerror(const char *, ...); int yyparse(void); @@ -399,7 +399,7 @@ yylex(void) } int -parse_config(char *filename, struct ntpd_conf *xconf) +parse_config(const char *filename, struct ntpd_conf *xconf) { conf = xconf; lineno = 1;