From 165fa068c8ba496d5173feb0b98148564580d8aa Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 26 Jul 2011 21:53:18 +0200
Subject: [PATCH] Rename x_asprintf2 to reformat

---
 ccache.h |  3 +--
 util.c   | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ccache.h b/ccache.h
index 2b55aca..7b86589 100644
--- a/ccache.h
+++ b/ccache.h
@@ -115,13 +115,12 @@ const char *tmp_string(void);
 char *format_hash_as_string(const unsigned char *hash, int size);
 int create_cachedirtag(const char *dir);
 char *format(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
+void reformat(char **ptr, const char *format, ...) ATTR_FORMAT(printf, 2, 3);
 char *x_strdup(const char *s);
 char *x_strndup(const char *s, size_t n);
 void *x_malloc(size_t size);
 void *x_calloc(size_t nmemb, size_t size);
 void *x_realloc(void *ptr, size_t size);
-void x_asprintf2(char **ptr, const char *format, ...)
-	ATTR_FORMAT(printf, 2, 3);
 void traverse(const char *dir, void (*fn)(const char *, struct stat *));
 char *basename(const char *path);
 char *dirname(const char *path);
diff --git a/util.c b/util.c
index ebe90f9..82fd28d 100644
--- a/util.c
+++ b/util.c
@@ -646,10 +646,11 @@ x_realloc(void *ptr, size_t size)
 
 
 /*
- * This is like x_asprintf() but frees *ptr if *ptr != NULL.
+ * Construct a string according to the format and store it in *ptr. The
+ * original *ptr is then freed.
  */
 void
-x_asprintf2(char **ptr, const char *format, ...)
+reformat(char **ptr, const char *format, ...)
 {
 	char *saved = *ptr;
 	va_list ap;
@@ -657,11 +658,11 @@ x_asprintf2(char **ptr, const char *format, ...)
 	*ptr = NULL;
 	va_start(ap, format);
 	if (vasprintf(ptr, format, ap) == -1) {
-		fatal("Out of memory in x_asprintf2");
+		fatal("Out of memory in reformat");
 	}
 	va_end(ap);
 
-	if (!ptr) fatal("Out of memory in x_asprintf2");
+	if (!ptr) fatal("Out of memory in reformat");
 	if (saved) {
 		free(saved);
 	}
@@ -1106,7 +1107,7 @@ get_relative_path(const char *from, const char *to)
 	common_prefix_len = common_dir_prefix_length(from, to);
 	for (p = from + common_prefix_len; *p; p++) {
 		if (*p == '/') {
-			x_asprintf2(&result, "../%s", result);
+			reformat(&result, "../%s", result);
 		}
 	}
 	if (strlen(to) > common_prefix_len) {
@@ -1114,7 +1115,7 @@ get_relative_path(const char *from, const char *to)
 		while (*p == '/') {
 			p++;
 		}
-		x_asprintf2(&result, "%s%s", result, p);
+		reformat(&result, "%s%s", result, p);
 	}
 	i = strlen(result) - 1;
 	while (i >= 0 && result[i] == '/') {
@@ -1342,7 +1343,7 @@ expand_variable(const char **str, char **result, char **errmsg)
 
 	if (q == p) {
 		/* Special case: don't consider a single $ the start of a variable. */
-		x_asprintf2(result, "%s$", *result);
+		reformat(result, "%s$", *result);
 		return true;
 	}
 
@@ -1353,7 +1354,7 @@ expand_variable(const char **str, char **result, char **errmsg)
 		free(name);
 		return false;
 	}
-	x_asprintf2(result, "%s%s", *result, value);
+	reformat(result, "%s%s", *result, value);
 	if (!curly) {
 		--q;
 	}
@@ -1383,7 +1384,7 @@ subst_env_in_string(const char *str, char **errmsg)
 	q = str;
 	for (q = str; *q; ++q) {
 		if (*q == '$') {
-			x_asprintf2(&result, "%s%.*s", result, (int)(q - p), p);
+			reformat(&result, "%s%.*s", result, (int)(q - p), p);
 			if (!expand_variable(&q, &result, errmsg)) {
 				free(result);
 				return NULL;
@@ -1391,6 +1392,6 @@ subst_env_in_string(const char *str, char **errmsg)
 			p = q + 1;
 		}
 	}
-	x_asprintf2(&result, "%s%.*s", result, (int)(q - p), p);
+	reformat(&result, "%s%.*s", result, (int)(q - p), p);
 	return result;
 }