From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Jun 2008 09:33:22 +0000 (+0200)
Subject: fsck: Rename para_malloc() and friends.
X-Git-Tag: v0.1.0~63
X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=commitdiff_plain;h=af89ce791ead29cb2a86e257f8e8d113c6ac205f

fsck: Rename para_malloc() and friends.
---

diff --git a/fsck.c b/fsck.c
index dea7ad6..55c134a 100644
--- a/fsck.c
+++ b/fsck.c
@@ -130,7 +130,7 @@ static int _write_all(int fd, const char *buf, size_t len)
  *
  * \sa malloc(3).
  */
-__must_check __malloc static void *para_malloc(size_t size)
+__must_check __malloc static void *fsck_malloc(size_t size)
 {
 	assert(size);
 	void *p = malloc(size);
@@ -155,9 +155,9 @@ __must_check __malloc static void *para_malloc(size_t size)
  *
  * \sa calloc(3)
  */
-__must_check __malloc static void *para_calloc(size_t size)
+__must_check __malloc static void *fsck_calloc(size_t size)
 {
-	void *ret = para_malloc(size);
+	void *ret = fsck_malloc(size);
 
 	memset(ret, 0, size);
 	return ret;
@@ -176,7 +176,7 @@ __must_check __malloc static void *para_calloc(size_t size)
  *
  * \sa strdup(3)
  */
-__must_check __malloc static char *para_strdup(const char *s)
+__must_check __malloc static char *fsck_strdup(const char *s)
 {
 	char *ret;
 
@@ -428,7 +428,7 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
 {
 	int i, j, ret;
 	const struct osl_column_description *cd;
-	uint32_t *loss = para_malloc(sizeof(uint32_t) * t->desc->num_columns);
+	uint32_t *loss = fsck_malloc(sizeof(uint32_t) * t->desc->num_columns);
 
 	INFO_LOG("looking for mapped objects not contained in index\n");
 	/* first count used bytes */
@@ -496,8 +496,8 @@ static int prune_objects(struct osl_table *t, uint32_t *lost_bytes)
 {
 	int i, ret;
 	const struct osl_column_description *cd;
-	char **col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
-	char **new_col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
+	char **col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
+	char **new_col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
 	char *idx_filename = index_filename(t->desc);
 	char *old_idx_filename = make_message("%s.bak", idx_filename);
 	int fd;
@@ -630,7 +630,7 @@ static int check_disk_storage_presence(struct osl_table *t)
 
 	if (!t->num_rows)
 		return 1;
-	hashes = para_malloc(t->num_rows * HASH_SIZE);
+	hashes = fsck_malloc(t->num_rows * HASH_SIZE);
 	INFO_LOG("looking for missing disk storage objects\n");
 	for (i = 0; i < t->num_rows; i++) {
 		if (row_is_invalid(t, i))
@@ -849,7 +849,7 @@ const char *get_asc_storage_type(enum osl_storage_type st)
 
 #define APPEND_ASC_SF(sf, flag, str) do { if (sf & flag) { \
 	if (str) str = make_message("%s%s", str, " | " # flag); \
-	else str = para_strdup(#flag); }} while (0)
+	else str = fsck_strdup(#flag); }} while (0)
 
 
 char *get_asc_storage_flags(enum osl_storage_type sf)