X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=ec174ff69ed768645bd92705d1384b0cc074ea06;hp=30623d1b321b8dfed84b07c33034fc20e05dd351;hb=c4ecbd8f75be7847f7332dd64f11a0ba54233891;hpb=25e6054e929908d9e21a2dd39996117e93124da5 diff --git a/fd.c b/fd.c index 30623d1b..ec174ff6 100644 --- a/fd.c +++ b/fd.c @@ -118,28 +118,6 @@ void para_fd_set(int fd, fd_set *fds, int *max_fileno) *max_fileno = PARA_MAX(*max_fileno, fd); } -/** - * paraslash's wrapper for fread(3) - * - * \param dest destination pointer - * \param nbytes size of one element - * \param nmemb number of elements to write - * \param stream the input stream - * - * \return negative on errors, zero on end of file, and the number of bytes - * (not elements) read on success. - * - * \sa fread(3) - */ -__must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *stream) -{ - size_t res = fread(dest, nbytes, nmemb, stream); - if (res == nmemb) - return nbytes * nmemb; - if (feof(stream)) - return 0; - return -E_FREAD; -} /** * paraslash's wrapper for fgets(3) * \param line pointer to the buffer to store the line @@ -167,23 +145,6 @@ again: goto again; } -/** - * paralash's wrapper for fseek(3) - * - * \param stream stream to seek - * \param offset added to the position specified by whence - * \param whence \p SEEK_SET, \p SEEK_CUR, or \p SEEK_END - * - * \return positive on success, -E_FSEEK on errors. - * - * \sa fseek(3) - */ -int para_fseek(FILE *stream, long offset, int whence) -{ - int ret = fseek(stream, offset, whence); - return ret < 0? -E_FSEEK : 1; -} - /** * *paraslash's wrapper for mmap * @@ -202,7 +163,9 @@ void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset) void *ret = mmap(NULL, length, prot, flags, fd, offset); if (ret != MAP_FAILED) return ret; - PARA_EMERG_LOG("mmap failed: %s", strerror(errno)); + PARA_EMERG_LOG("mmap failed: %s\n", strerror(errno)); + PARA_EMERG_LOG("length: %zu, flags: %d, fd: %d, offset: %zu\n", + length, flags, fd, (size_t)offset); exit(EXIT_FAILURE); }