X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fd.c;h=f0e849d1a71509d7a22a994ea77292c929bfd44f;hb=13f7369b41a0090d68da1a123ebbf89c1ab820a1;hp=db1825cdbf991c3426270c5dc8a00ad0b9cd6499;hpb=fd7ddaebab6613627a070e8867ace2f2eb3d4cc3;p=paraslash.git diff --git a/fd.c b/fd.c index db1825cd..f0e849d1 100644 --- a/fd.c +++ b/fd.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2006-2007 Andre Noll * - * 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 - * (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, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file fd.c helper functions for file descriptor handling */ @@ -63,9 +51,11 @@ int para_select(int n, fd_set *readfds, fd_set *writefds, ret = select(n, readfds, writefds, NULL, timeout_tv); err = errno; } while (ret < 0 && err == EINTR); - if (ret < 0) + if (ret < 0) { PARA_CRIT_LOG("select error: %s, max_fileno: %d\n", strerror(err), n); + ret = -E_SELECT; + } return ret; } @@ -165,7 +155,7 @@ void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset) return ret; PARA_EMERG_LOG("mmap failed: %s\n", strerror(errno)); PARA_EMERG_LOG("length: %zu, flags: %d, fd: %d, offset: %zu\n", - length, flags, fd, offset); + length, flags, fd, (size_t)offset); exit(EXIT_FAILURE); }