import of dnsmasq-2.41.tar.gz

This commit is contained in:
Simon Kelley committed 2012-01-05 17:31:13 +00:00
1 parent 5aabfc78bc
commit 824af85bdf
42 files changed
+8609 -4729

No files matched your search

+8 -5
View File
@@ -1,16 +1,19 @@
/* dnsmasq is Copyright (c) 2000 - 2005 Simon Kelley
/* dnsmasq is Copyright (c) 2000-2007 Simon Kelley
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; version 2 dated June, 1991.
the Free Software Foundation; version 2 dated June, 1991, or
(at your option) version 3 dated 29 June, 2007.
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, see <http://www.gnu.org/licenses/>.
*/
/* Some code in this file contributed by Rob Funk. */
#include "dnsmasq.h"
@@ -344,7 +347,7 @@ int expand_buf(struct iovec *iov, size_t size)
{
void *new;
if (size <= iov->iov_len)
if (size <= (size_t)iov->iov_len)
return 1;
if (!(new = whine_malloc(size)))