Browse Source

use a setup function for options, cleaner; ok cloder

OPENBSD_4_3
deraadt 17 years ago
parent
commit
464e8d28dd
1 changed files with 13 additions and 5 deletions
  1. +13
    -5
      src/usr.sbin/ntpd/parse.y

+ 13
- 5
src/usr.sbin/ntpd/parse.y View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.34 2007/09/14 03:07:11 ckuethe Exp $ */
/* $OpenBSD: parse.y,v 1.35 2007/09/14 06:29:54 deraadt Exp $ */
/* /*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -55,6 +55,7 @@ struct opts {
int weight; int weight;
int correction; int correction;
} opts; } opts;
void opts_default(void);
typedef struct { typedef struct {
union { union {
@ -216,10 +217,10 @@ address : STRING {
} }
; ;
server_opts : { bzero(&opts, sizeof opts); opts.weight = 1; }
server_opts : { opts_default(); }
server_opts_l server_opts_l
{ $$ = opts; } { $$ = opts; }
| { bzero(&opts, sizeof opts); opts.weight = 1; $$ = opts; }
| { opts_default(); $$ = opts; }
; ;
server_opts_l : server_opts_l server_opt server_opts_l : server_opts_l server_opt
| server_opt | server_opt
@ -227,10 +228,10 @@ server_opts_l : server_opts_l server_opt
server_opt : weight server_opt : weight
; ;
sensor_opts : { bzero(&opts, sizeof opts); opts.weight = 1; }
sensor_opts : { opts_default(); }
sensor_opts_l sensor_opts_l
{ $$ = opts; } { $$ = opts; }
| { bzero(&opts, sizeof opts); opts.weight = 1; $$ = opts; }
| { opts_default(); $$ = opts; }
; ;
sensor_opts_l : sensor_opts_l sensor_opt sensor_opts_l : sensor_opts_l sensor_opt
| sensor_opt | sensor_opt
@ -260,6 +261,13 @@ weight : WEIGHT NUMBER {
%% %%
void
opts_default(void)
{
bzero(&opts, sizeof opts);
opts.weight = 1;
}
struct keywords { struct keywords {
const char *k_name; const char *k_name;
int k_val; int k_val;


Loading…
Cancel
Save