[servconf.c readconf.c]
     remove now-unused variables
This commit is contained in:
Darren Tucker 2013-05-16 20:48:14 +10:00
parent e194ba4111
commit 9113d0c238
3 changed files with 9 additions and 6 deletions

View File

@ -50,6 +50,9 @@
- dtucker@cvs.openbsd.org 2013/05/16 09:12:31
[readconf.c servconf.c]
switch RekeyLimit traffic volume parsing to scan_scaled. ok djm@
- dtucker@cvs.openbsd.org 2013/05/16 10:43:34
[servconf.c readconf.c]
remove now-unused variables
- (dtucker) [configure.ac readconf.c servconf.c
openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled.

View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.200 2013/05/16 09:12:31 dtucker Exp $ */
/* $OpenBSD: readconf.c,v 1.201 2013/05/16 10:43:34 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -385,9 +385,9 @@ process_config_line(Options *options, const char *host,
char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
char **cpptr, fwdarg[256];
u_int i, *uintptr, max_entries = 0;
int negated, opcode, *intptr, value, value2, scale;
int negated, opcode, *intptr, value, value2;
LogLevel *log_level_ptr;
long long orig, val64;
long long val64;
size_t len;
Forward fwd;

View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.236 2013/05/16 09:12:31 dtucker Exp $ */
/* $OpenBSD: servconf.c,v 1.237 2013/05/16 10:43:34 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@ -812,13 +812,13 @@ process_server_config_line(ServerOptions *options, char *line,
struct connection_info *connectinfo)
{
char *cp, **charptr, *arg, *p, *endofnumber;
int cmdline = 0, *intptr, value, value2, n, port, scale;
int cmdline = 0, *intptr, value, value2, n, port;
SyslogFacility *log_facility_ptr;
LogLevel *log_level_ptr;
ServerOpCodes opcode;
u_int i, flags = 0;
size_t len;
long long orig, val64;
long long val64;
const struct multistate *multistate_ptr;
cp = line;