summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2016-12-31 11:56:35 +0100
committerGuillem Jover <guillem@debian.org>2017-01-23 00:17:07 +0100
commitbf4f4ab7c51b1415cbe940a972ec3d54bbdb5561 (patch)
treebcd3a6d67551e5175fe81b9b0de9ace1e5ffd080 /utils
parent85c3f8489e5eff5bdaf50ec3959a7798876f7a97 (diff)
downloaddpkg-bf4f4ab7c51b1415cbe940a972ec3d54bbdb5561.tar.gz
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.
Diffstat (limited to 'utils')
-rw-r--r--utils/update-alternatives.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 39f0c04c0..7a41c00ee 100644
--- a/utils/update-alternatives.c
+++ b/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)
{