summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-16 20:48:57 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-16 20:48:57 +1000
commit09c0f0325b2f538de9a1073e03b8ef26dece4c16 (patch)
tree11bcf2fac86c5b9adeab053100c096a3ad445072
parent9113d0c2381202412c912a20c8083ab7d6824ec9 (diff)
- dtucker@cvs.openbsd.org 2013/05/16 10:44:06
[servconf.c] remove another now-unused variable
-rw-r--r--ChangeLog3
-rw-r--r--servconf.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1fb0e4fc..dc9d7f63c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
53 - dtucker@cvs.openbsd.org 2013/05/16 10:43:34 53 - dtucker@cvs.openbsd.org 2013/05/16 10:43:34
54 [servconf.c readconf.c] 54 [servconf.c readconf.c]
55 remove now-unused variables 55 remove now-unused variables
56 - dtucker@cvs.openbsd.org 2013/05/16 10:44:06
57 [servconf.c]
58 remove another now-unused variable
56 - (dtucker) [configure.ac readconf.c servconf.c 59 - (dtucker) [configure.ac readconf.c servconf.c
57 openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled. 60 openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled.
58 61
diff --git a/servconf.c b/servconf.c
index d77694476..90f6d4653 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.237 2013/05/16 10:43:34 dtucker Exp $ */ 2/* $OpenBSD: servconf.c,v 1.238 2013/05/16 10:44:06 dtucker Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -811,7 +811,7 @@ process_server_config_line(ServerOptions *options, char *line,
811 const char *filename, int linenum, int *activep, 811 const char *filename, int linenum, int *activep,
812 struct connection_info *connectinfo) 812 struct connection_info *connectinfo)
813{ 813{
814 char *cp, **charptr, *arg, *p, *endofnumber; 814 char *cp, **charptr, *arg, *p;
815 int cmdline = 0, *intptr, value, value2, n, port; 815 int cmdline = 0, *intptr, value, value2, n, port;
816 SyslogFacility *log_facility_ptr; 816 SyslogFacility *log_facility_ptr;
817 LogLevel *log_level_ptr; 817 LogLevel *log_level_ptr;