diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-01-01 20:32:26 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-01-01 20:32:26 +1100 |
commit | 1e44c5ded38b59ab6bdb8d5c5e85583628b9971c (patch) | |
tree | 27b1807e60df4143146b8386bfba6dd08bff01ed /readconf.c | |
parent | 528d6fa10afce818b794eb73c8e3693ac5d2c493 (diff) |
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2007/12/31 10:41:31
[readconf.c servconf.c]
Prevent strict-aliasing warnings on newer gcc versions. bz #1355, patch
from Dmitry V. Levin, ok djm@
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/readconf.c b/readconf.c index df058d35a..1d6409fdb 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.163 2007/10/22 19:10:24 markus Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.164 2007/12/31 10:41:31 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -326,6 +326,7 @@ process_config_line(Options *options, const char *host, | |||
326 | { | 326 | { |
327 | char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256]; | 327 | char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256]; |
328 | int opcode, *intptr, value, value2, scale; | 328 | int opcode, *intptr, value, value2, scale; |
329 | LogLevel *log_level_ptr; | ||
329 | long long orig, val64; | 330 | long long orig, val64; |
330 | size_t len; | 331 | size_t len; |
331 | Forward fwd; | 332 | Forward fwd; |
@@ -692,14 +693,14 @@ parse_int: | |||
692 | break; | 693 | break; |
693 | 694 | ||
694 | case oLogLevel: | 695 | case oLogLevel: |
695 | intptr = (int *) &options->log_level; | 696 | log_level_ptr = &options->log_level; |
696 | arg = strdelim(&s); | 697 | arg = strdelim(&s); |
697 | value = log_level_number(arg); | 698 | value = log_level_number(arg); |
698 | if (value == SYSLOG_LEVEL_NOT_SET) | 699 | if (value == SYSLOG_LEVEL_NOT_SET) |
699 | fatal("%.200s line %d: unsupported log level '%s'", | 700 | fatal("%.200s line %d: unsupported log level '%s'", |
700 | filename, linenum, arg ? arg : "<NONE>"); | 701 | filename, linenum, arg ? arg : "<NONE>"); |
701 | if (*activep && (LogLevel) *intptr == SYSLOG_LEVEL_NOT_SET) | 702 | if (*activep && *log_level_ptr == SYSLOG_LEVEL_NOT_SET) |
702 | *intptr = (LogLevel) value; | 703 | *log_level_ptr = (LogLevel) value; |
703 | break; | 704 | break; |
704 | 705 | ||
705 | case oLocalForward: | 706 | case oLocalForward: |