Move para_truncate from osl.c to fd.c.

diff --git a/fd.c b/fd.c
index b889d9d2144a4ad78cf6442997d80fec643aad87..920bce9cf49a132a868c1983f990cd7fd124748a 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -322,3 +322,34 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
        return p;
 }
 
        return p;
 }
 

+/**
+ * A wrapper for truncate(2)
+ *
+ * \param path Name of the regular file to truncate
+ * \param size Number of bytes to \b shave \b off
+ *
+ * Truncate the regular file named by \a path by \a size bytes.
+ *
+ * \return Standard.
+ *
+ * \sa truncate(2)
+ */
+int para_truncate(const char *path, off_t size)
+{
+       int ret;
+       struct stat statbuf;
+
+       ret = -E_OSL_STAT;
+       if (stat(path, &statbuf) < 0)
+               goto out;
+       ret = -E_OSL_BAD_SIZE;
+       if (statbuf.st_size < size)
+               goto out;
+       ret = -E_OSL_TRUNC;
+       if (truncate(path, statbuf.st_size - size) < 0)
+               goto out;
+       ret = 1;
+out:
+       return ret;
+}
+

diff --git a/fd.h b/fd.h
index 4b802062d7207344ef3441542a3fe090ba18bd67..9c43eec179e9f363cfe56c4592fcd8d754e95b2f 100644 (file)
--- a/fd.h
+++ b/fd.h
@@ -14,6 +14,7 @@ int mmap_full_file(const char *filename, int open_mode, void **map,
 int osl_munmap(void *start, size_t length);
 int write_all(int fd, const char *buf, size_t *len);
 int write_file(const char *filename, const void *buf, size_t size);
 int osl_munmap(void *start, size_t length);
 int write_all(int fd, const char *buf, size_t *len);
 int write_file(const char *filename, const void *buf, size_t size);

+int para_truncate(const char *filename, off_t size);

 
 /**
  * A wrapper for mkdir(2).
 
 /**
  * A wrapper for mkdir(2).

diff --git a/osl.c b/osl.c
index 08374299cc26d9ac3128bd73858b605ffaf201fb..3e41c530399579c4400d6a4d0d879c9e50576539 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -1178,37 +1178,6 @@ static int append_row_index(const struct osl_table *t, char *row_index)
        return ret;
 }
 
        return ret;
 }
 

-/**
- * A wrapper for truncate(2)
- *
- * \param path Name of the regular file to truncate
- * \param size Number of bytes to \b shave \b off
- *
- * Truncate the regular file named by \a path by \a size bytes.
- *
- * \return Standard.
- *
- * \sa truncate(2)
- */
-int para_truncate(const char *path, off_t size)
-{
-       int ret;
-       struct stat statbuf;
-
-       ret = -E_OSL_STAT;
-       if (stat(path, &statbuf) < 0)
-               goto out;
-       ret = -E_OSL_BAD_SIZE;
-       if (statbuf.st_size < size)
-               goto out;
-       ret = -E_OSL_TRUNC;
-       if (truncate(path, statbuf.st_size - size) < 0)
-               goto out;
-       ret = 1;
-out:
-       return ret;
-}
-

 static int truncate_mapped_file(const struct osl_table *t, unsigned col_num,
                off_t size)
 {
 static int truncate_mapped_file(const struct osl_table *t, unsigned col_num,
                off_t size)
 {

diff --git a/osl_core.h b/osl_core.h
index 966ef6fd5bde16747f968a2dbd788269db772e0c..8a575c685e9e698995d5f8b8c41cb704620812cb 100644 (file)
--- a/osl_core.h
+++ b/osl_core.h
@@ -83,7 +83,6 @@ int init_table_structure(const struct osl_table_description *desc,
 int row_is_invalid(struct osl_table *t, uint32_t row_num);
 int get_mapped_object(const struct osl_table *t, unsigned col_num,
        uint32_t row_num, struct osl_object *obj);
 int row_is_invalid(struct osl_table *t, uint32_t row_num);
 int get_mapped_object(const struct osl_table *t, unsigned col_num,
        uint32_t row_num, struct osl_object *obj);

-int para_truncate(const char *filename, off_t size);

 int unmap_table(struct osl_table *t, enum osl_close_flags flags);
 int init_rbtrees(struct osl_table *t);
 
 int unmap_table(struct osl_table *t, enum osl_close_flags flags);
 int init_rbtrees(struct osl_table *t);