X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.h;h=cb3194bea087dd95600e9e5b947435d2e8c186c5;hp=50570ee1b679d3e2183a5a8bf74bfc6b3cbda2f3;hb=4df56926d10669ec120510957d3aa3fddb16e3c6;hpb=f6f50d03a09d6bc423324206d274336e9905bbb4 diff --git a/osl.h b/osl.h index 50570ee1..cb3194be 100644 --- a/osl.h +++ b/osl.h @@ -7,12 +7,12 @@ /** \file osl.h User interface for the object storage layer. */ -/** decribes an object of the object storage layer (osl) */ +/** describes an object of the object storage layer (osl) */ struct osl_object { /** Pointer to the data of the object. */ void *data; /** The object's size. */ - off_t size; + size_t size; }; /** Flags that change the internal handling of osl tables. */ @@ -93,7 +93,7 @@ struct osl_column_description { char *name; /** * For columns with an associated rbtree, this must point to a function - * that compares the values of two objects, either a builtin function + * that compares the values of two objects, either a built-in function * or a function defined by the application may be supplied. This * field is ignored if the column does not have an associated rbtree. * @@ -124,7 +124,7 @@ struct osl_table_description { uint16_t num_columns; /** Further table-wide information. */ enum osl_table_flags flags; - /** The array desribing the individual columns of the table. */ + /** The array describing the individual columns of the table. */ struct osl_column_description *column_descriptions; }; @@ -179,28 +179,7 @@ int osl_get_rank(const struct osl_table *t, struct osl_row *r, int for_each_file_in_dir(const char *dirname, int (*func)(const char *, const void *), const void *private_data); -int para_open(const char *pathname, int flags, mode_t mode); -int mmap_full_file(const char *filename, int open_mode, struct osl_object *obj); 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); -int para_mkdir(const char *path, mode_t mode); -/** - * 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; -}