Skip to content
Snippets Groups Projects
Commit 788d5752 authored by Simon McVittie's avatar Simon McVittie
Browse files

wrap: Add a NULL to multiarch_tuples


This lets us use it as a GStrv-style string array.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 4a478c40
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
static const char * const multiarch_tuples[] = static const char * const multiarch_tuples[] =
{ {
"x86_64-linux-gnu", "x86_64-linux-gnu",
"i386-linux-gnu" "i386-linux-gnu",
NULL
}; };
/* /*
...@@ -582,7 +583,9 @@ bind_runtime (FlatpakBwrap *bwrap, ...@@ -582,7 +583,9 @@ bind_runtime (FlatpakBwrap *bwrap,
"--ro-bind", "/etc/group", "/etc/group", "--ro-bind", "/etc/group", "/etc/group",
NULL); NULL);
for (i = 0; i < G_N_ELEMENTS (multiarch_tuples); i++) g_assert (multiarch_tuples[G_N_ELEMENTS (multiarch_tuples) - 1] == NULL);
for (i = 0; i < G_N_ELEMENTS (multiarch_tuples) - 1; i++)
{ {
g_autofree gchar *tool = g_strdup_printf ("%s-capsule-capture-libs", g_autofree gchar *tool = g_strdup_printf ("%s-capsule-capture-libs",
multiarch_tuples[i]); multiarch_tuples[i]);
...@@ -747,6 +750,7 @@ bind_runtime (FlatpakBwrap *bwrap, ...@@ -747,6 +750,7 @@ bind_runtime (FlatpakBwrap *bwrap,
} }
/* /lib32 or /lib64 */ /* /lib32 or /lib64 */
g_assert (i < G_N_ELEMENTS (libquals));
libqual = libquals[i]; libqual = libquals[i];
dirs = g_new0 (gchar *, 7); dirs = g_new0 (gchar *, 7);
...@@ -775,7 +779,9 @@ bind_runtime (FlatpakBwrap *bwrap, ...@@ -775,7 +779,9 @@ bind_runtime (FlatpakBwrap *bwrap,
{ {
GString *archs = g_string_new (""); GString *archs = g_string_new ("");
for (i = 0; i < G_N_ELEMENTS (multiarch_tuples); i++) g_assert (multiarch_tuples[G_N_ELEMENTS (multiarch_tuples) - 1] == NULL);
for (i = 0; i < G_N_ELEMENTS (multiarch_tuples) - 1; i++)
{ {
if (archs->len > 0) if (archs->len > 0)
g_string_append (archs, ", "); g_string_append (archs, ", ");
...@@ -1762,7 +1768,9 @@ main (int argc, ...@@ -1762,7 +1768,9 @@ main (int argc,
* of setting LD_LIBRARY_PATH, for better robustness against * of setting LD_LIBRARY_PATH, for better robustness against
* games that set their own LD_LIBRARY_PATH ignoring what they * games that set their own LD_LIBRARY_PATH ignoring what they
* got from the environment */ * got from the environment */
for (i = 0; i < G_N_ELEMENTS (multiarch_tuples); i++) g_assert (multiarch_tuples[G_N_ELEMENTS (multiarch_tuples) - 1] == NULL);
for (i = 0; i < G_N_ELEMENTS (multiarch_tuples) - 1; i++)
{ {
g_autofree gchar *ld_path = NULL; g_autofree gchar *ld_path = NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment