Bläddra i källkod

u-a: Move xvasprintf() and xasprintf() definitions earlier in the code

This will make it possible to use these functions without having to use
forward declarations.
Guillem Jover 9 år sedan
förälder
incheckning
bf4f4ab7c5
1 ändrade filer med 24 tillägg och 24 borttagningar
  1. 24 24
      utils/update-alternatives.c

+ 24 - 24
utils/update-alternatives.c

@@ -269,6 +269,30 @@ xstrdup(const char *str)
 	return new_str;
 }
 
+static char * DPKG_ATTR_VPRINTF(1)
+xvasprintf(const char *fmt, va_list args)
+{
+	char *str;
+
+	if (vasprintf(&str, fmt, args) < 0)
+		error(_("failed to allocate memory"));
+
+	return str;
+}
+
+static char * DPKG_ATTR_PRINTF(1)
+xasprintf(const char *fmt, ...)
+{
+	va_list args;
+	char *str;
+
+	va_start(args, fmt);
+	str = xvasprintf(fmt, args);
+	va_end(args);
+
+	return str;
+}
+
 static char *
 areadlink(const char *linkname)
 {
@@ -314,30 +338,6 @@ xreadlink(const char *linkname)
 	return buf;
 }
 
-static char * DPKG_ATTR_VPRINTF(1)
-xvasprintf(const char *fmt, va_list args)
-{
-	char *str;
-
-	if (vasprintf(&str, fmt, args) < 0)
-		error(_("failed to allocate memory"));
-
-	return str;
-}
-
-static char * DPKG_ATTR_PRINTF(1)
-xasprintf(const char *fmt, ...)
-{
-	va_list args;
-	char *str;
-
-	va_start(args, fmt);
-	str = xvasprintf(fmt, args);
-	va_end(args);
-
-	return str;
-}
-
 static void
 set_action(const char *new_action)
 {