X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=6731e954c4673738544c3c7ca6092a779bac80d1;hb=a88534cd677dcd6cb2847060ec4f39d56e219bf7;hp=0b3e88c487d7aa15a65c188af04826e9d13f93ea;hpb=b0884806fccc7a0b1e489ee57a3fa02e3a16fe84;p=osl.git

diff --git a/osl.c b/osl.c
index 0b3e88c..6731e95 100644
--- a/osl.c
+++ b/osl.c
@@ -8,7 +8,6 @@
 #include <dirent.h> /* readdir() */
 #include <assert.h>
 
-
 #include "log.h"
 #include "osl.h"
 #include "error.h"
@@ -16,52 +15,6 @@
 #include "list.h"
 #include "osl_core.h"
 
-/**
- * Allocate a sufficiently large string and print into it.
- *
- * \param fmt A usual format string.
- *
- * Produce output according to \p fmt. No artificial bound on the length of the
- * resulting string is imposed.
- *
- * \return This function either returns a pointer to a string that must be
- * freed by the caller or \p NULL if memory allocation failed.
- *
- * \sa printf(3).
- */
-static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
-{
-	int n;
-	size_t size = 100;
-	char *p = malloc(size);
-
-	if (!p)
-		return NULL;
-	while (1) {
-		char *q;
-		va_list ap;
-		/* Try to print in the allocated space. */
-		va_start(ap, fmt);
-		n = vsnprintf(p, size, fmt, ap);
-		va_end(ap);
-		/* If that worked, return the string. */
-		if (n > -1 && n < size)
-			break;
-		/* Else try again with more space. */
-		if (n > -1) /* glibc 2.1 */
-			size = n + 1; /* precisely what is needed */
-		else /* glibc 2.0 */
-			size *= 2; /* twice the old size */
-		q = realloc(p, size);
-		if (!q) {
-			free(p);
-			return NULL;
-		}
-		p = q;
-	}
-	return p;
-}
-
 /* Taken from Drepper: How to write shared libraries, Appendix B. */
 #include <stddef.h>
 #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
@@ -91,7 +44,7 @@ __export const char *osl_strerror(int num)
 	return msgstr.str + errmsgidx[num];
 }
 
-static int loglevel;
+int loglevel;
 
 static void __attribute ((constructor)) init_loglevel(void)
 {
@@ -154,88 +107,6 @@ static int __lseek(int fd, off_t *offset, int whence)
 	return 1;
 }
 
-/**
- * Wrapper for the write system call.
- *
- * \param fd The file descriptor to write to.
- * \param buf The buffer to write.
- * \param size The length of \a buf in bytes.
- *
- * This function writes out the given buffer and retries if an interrupt
- * occurred during the write.
- *
- * \return On success, the number of bytes written is returned, otherwise, the
- * function returns \p -E_OSL_WRITE.
- *
- * \sa write(2).
- */
-static ssize_t __write(int fd, const void *buf, size_t size)
-{
-	ssize_t ret;
-
-	for (;;) {
-		ret = write(fd, buf, size);
-		if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
-			continue;
-		return ret >= 0? ret : -E_OSL_WRITE;
-	}
-}
-
-/**
- * Write the whole buffer to a file descriptor.
- *
- * \param fd The file descriptor to write to.
- * \param buf The buffer to write.
- * \param size The length of \a buf in bytes.
- *
- * This function writes the given buffer and continues on short writes and
- * when interrupted by a signal.
- *
- * \return Positive on success, negative on errors. Possible errors: any
- * errors returned by para_write().
- *
- * \sa para_write().
- */
-static ssize_t write_all(int fd, const void *buf, size_t size)
-{
-//	DEBUG_LOG("writing %zu bytes\n", size);
-	const char *b = buf;
-	while (size) {
-		ssize_t ret = __write(fd, b, size);
-//		DEBUG_LOG("ret: %zd\n", ret);
-		if (ret < 0)
-			return ret;
-		b += ret;
-		size -= ret;
-	}
-	return 1;
-}
-/**
- * Open a file, write the given buffer and close the file.
- *
- * \param filename Full path to the file to open.
- * \param buf The buffer to write to the file.
- * \param size The size of \a buf.
- *
- * \return Standard.
- */
-static int write_file(const char *filename, const void *buf, size_t size)
-{
-	int ret, fd;
-
-	ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
-	if (ret < 0)
-		return ret;
-	fd = ret;
-	ret = write_all(fd, buf, size);
-	if (ret < 0)
-		goto out;
-	ret = 1;
-out:
-	close(fd);
-	return ret;
-}
-
 static int append_file(const char *filename, char *header, size_t header_size,
 	char *data, size_t data_size, uint32_t *new_pos)
 {
@@ -247,11 +118,11 @@ static int append_file(const char *filename, char *header, size_t header_size,
 		return ret;
 	fd = ret;
 	if (header && header_size) {
-		ret = write_all(fd, header, header_size);
+		ret = write_all(fd, header, &header_size);
 		if (ret < 0)
 			goto out;
 	}
-	ret = write_all(fd, data, data_size);
+	ret = write_all(fd, data, &data_size);
 	if (ret < 0)
 		goto out;
 	if (new_pos) {