X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.h;h=58969a4392aab2d22383cc93ecd90aa36599ec8c;hp=1fec9865dabe1854272a7e7476185db583aeee9e;hb=78882bd94652b156e55e6385a33cd5126c439651;hpb=97f53e18953fc2013c0b14f0261ac385e45b0284

diff --git a/osl.h b/osl.h
index 1fec9865..58969a43 100644
--- a/osl.h
+++ b/osl.h
@@ -1,6 +1,6 @@
 #include <sys/mman.h>
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -58,7 +58,9 @@ enum osl_storage_flags {
 	/** The data for this column will have constant size. */
 	OSL_FIXED_SIZE = 2,
 	/** All values of this column will be different. */
-	OSL_UNIQUE = 4
+	OSL_UNIQUE = 4,
+	/** Do not free the data for this column (\p OSL_NO_STORAGE). */
+	OSL_DONT_FREE = 8
 };
 
 struct osl_table;
@@ -178,26 +180,8 @@ int osl_get_rank(const struct osl_table *t, struct osl_row *r,
 	unsigned col_num, unsigned *rank);
 
 int for_each_file_in_dir(const char *dirname,
-	int (*func)(const char *, const void *), const void *private_data);
+	int (*func)(const char *, void *), void *private_data);
 ssize_t para_write_all(int fd, const void *buf, size_t size);
 int para_lseek(int fd, off_t *offset, int whence);
 int para_write_file(const char *filename, const void *buf, size_t size);
 
-/**
- * A wrapper for munmap(2).
- *
- * \param start The start address of the memory mapping.
- * \param length The size of the mapping.
- *
- * \return Positive on success, \p -E_MUNMAP on errors.
- *
- * \sa munmap(2), mmap_full_file().
- */
-_static_inline_ int para_munmap(void *start, size_t length)
-{
-	if (munmap(start, length) >= 0)
-		return 1;
-	PARA_ERROR_LOG("munmap (%p/%zu) failed: %s\n", start, length,
-		strerror(errno));
-	return -E_MUNMAP;
-}