aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Arnold <garnold@google.com>2015-09-01 18:36:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 18:36:19 +0000
commit16b0468baacf64d60b9b2b533fdd96769baf482c (patch)
tree412efbc04977d7a682ecbbba0c8d64f23cf5578e
parent5b2e0d357a8a1d6681e0c623feae6dff38f9f404 (diff)
parent4a0ae0177f07c62d336268082539dd64149aa288 (diff)
downloadtlsdate-16b0468baacf64d60b9b2b533fdd96769baf482c.tar.gz
am 4a0ae017: Relocate a function to fix a build failure.
* commit '4a0ae0177f07c62d336268082539dd64149aa288': Relocate a function to fix a build failure.
-rw-r--r--src/tlsdated.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/tlsdated.c b/src/tlsdated.c
index 4517be0..63dfbd4 100644
--- a/src/tlsdated.c
+++ b/src/tlsdated.c
@@ -227,21 +227,6 @@ parse_argv (struct opts *opts, int argc, char *argv[])
/* Validate arguments */
}
-static const char **
-parse_supp_groups (char *arg)
-{
- size_t i;
- char *scan;
- const char **supp_groups;
-
- for (i = 1, scan = arg; (scan = strchr (scan, ',')); i++, scan++) ;
- supp_groups = (const char **) calloc (i + 1, sizeof (const char *));
- if (!supp_groups)
- die ("Failed to allocate memory for supplementary group names\n");
- for (i = 0; (supp_groups[i] = strsep (&arg, ",")); i++) ;
- return supp_groups;
-}
-
static
void add_source_to_conf (struct opts *opts, char *host, char *port, char *proxy)
{
@@ -465,6 +450,21 @@ cleanup_main (struct state *state)
}
#ifdef TLSDATED_MAIN
+static const char **
+parse_supp_groups (char *arg)
+{
+ size_t i;
+ char *scan;
+ const char **supp_groups;
+
+ for (i = 1, scan = arg; (scan = strchr (scan, ',')); i++, scan++) ;
+ supp_groups = (const char **) calloc (i + 1, sizeof (const char *));
+ if (!supp_groups)
+ die ("Failed to allocate memory for supplementary group names\n");
+ for (i = 0; (supp_groups[i] = strsep (&arg, ",")); i++) ;
+ return supp_groups;
+}
+
int API
main (int argc, char *argv[], char *envp[])
{