X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fgetdata.c;h=44860863dc842b8a5ca5d24c030be409b988417e;hb=17429ef85bfb4bdf51f4a659443fe4c31c972928;hp=b1e79b959deb9d57025e51c699ce7e8cacdeac18;hpb=849c8f5e73d671c7f9e3f74f0652a0876d7a2787;p=debian%2Fdhcpd-pools.git

diff --git a/src/getdata.c b/src/getdata.c
index b1e79b9..4486086 100644
--- a/src/getdata.c
+++ b/src/getdata.c
@@ -1,19 +1,18 @@
-/*
-** Copyright (C) 2006- Sami Kerola <kerolasa@iki.fi>
-**  
-** This program is free software; you can redistribute it and/or modify
+/* http://dhcpd-pools.sourceforge.net/
+** Copyright 2006- Sami Kerola <kerolasa@iki.fi>
+**
+** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation, either version 3 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -76,16 +75,16 @@ int parse_leases(void)
 		err(EXIT_FAILURE, "parse_leases: %s",
 		    config.dhcpdlease_file);
 	}
-#ifdef POSIX_FADV_NOREUSE
-	posix_fadvise((long) dhcpd_leases, 0, 0, POSIX_FADV_NOREUSE);
+#ifdef POSIX_FADV_WILLNEED
+	posix_fadvise((long) dhcpd_leases, 0, 0, POSIX_FADV_WILLNEED);
 	if (errno) {
-		err(EXIT_FAILURE, "parse_leases: fadvise noreuse");
+		err(EXIT_FAILURE, "parse_leases: fadvise %s", config.dhcpdlease_file);
 	}
-#endif				/* POSIX_FADV_NOREUSE */
+#endif				/* POSIX_FADV_WILLNEED */
 #ifdef POSIX_FADV_SEQUENTIAL
 	posix_fadvise((long) dhcpd_leases, 0, 0, POSIX_FADV_SEQUENTIAL);
 	if (errno) {
-		err(EXIT_FAILURE, "parse_leases: fadvise sequential");
+		err(EXIT_FAILURE, "parse_leases: fadvise %s", config.dhcpdlease_file);
 	}
 #endif				/* POSIX_FADV_SEQUENTIAL */
 
@@ -228,16 +227,16 @@ char *parse_config(int is_include, char *config_file,
 	if (dhcpd_config == NULL) {
 		err(EXIT_FAILURE, "parse_config: %s", config_file);
 	}
-#ifdef POSIX_FADV_NOREUSE
-	posix_fadvise((long) dhcpd_config, 0, 0, POSIX_FADV_NOREUSE);
+#ifdef POSIX_FADV_WILLNEED
+	posix_fadvise((long) dhcpd_config, 0, 0, POSIX_FADV_WILLNEED);
 	if (errno) {
-		err(EXIT_FAILURE, "parse_config: fadvise noreuse");
+		err(EXIT_FAILURE, "parse_config: fadvise %s", config_file);
 	}
-#endif				/* POSIX_FADV_NOREUSE */
+#endif				/* POSIX_FADV_WILLNEED */
 #ifdef POSIX_FADV_SEQUENTIAL
 	posix_fadvise((long) dhcpd_config, 0, 0, POSIX_FADV_SEQUENTIAL);
 	if (errno) {
-		err(EXIT_FAILURE, "parse_config: fadvise sequential");
+		err(EXIT_FAILURE, "parse_config: fadvise %s", config_file);
 	}
 #endif				/* POSIX_FADV_SEQUENTIAL */