summaryrefslogtreecommitdiffstats
path: root/ui/common/url.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-03-06 13:42:15 +0800
committerGeoff Levand <geoff@infradead.org>2013-03-06 06:05:37 -0800
commit861efae137793ac3b6c946aacd16cbe44c9e9032 (patch)
tree15aed641e35b0198fe9b5e79264ed3cc5ed6b8da /ui/common/url.c
parent76fdd1c6932624e1783d5d53683919c35728c945 (diff)
downloadtalos-petitboot-861efae137793ac3b6c946aacd16cbe44c9e9032.tar.gz
talos-petitboot-861efae137793ac3b6c946aacd16cbe44c9e9032.zip
ui/common/url: move pb_scheme_info array to file scope
We'd like to use the scheme info array for other functions, so move it to file scope, and rename to schemes. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'ui/common/url.c')
-rw-r--r--ui/common/url.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/ui/common/url.c b/ui/common/url.c
index 544eee2..64aa254 100644
--- a/ui/common/url.c
+++ b/ui/common/url.c
@@ -38,13 +38,7 @@ struct pb_scheme_info {
unsigned int str_len;
};
-/**
- * pb_url_find_scheme - Find the pb_scheme_info for a URL string.
- */
-
-static const struct pb_scheme_info *pb_url_find_scheme(const char *url_str)
-{
- static const struct pb_scheme_info a[] = {
+static const struct pb_scheme_info schemes[] = {
{
.scheme = pb_url_file,
.str = "file://",
@@ -80,20 +74,25 @@ static const struct pb_scheme_info *pb_url_find_scheme(const char *url_str)
.str = "tftp://",
.str_len = sizeof("tftp://") - 1,
},
- };
- static const struct pb_scheme_info file_scheme = {
- .str = "",
- .scheme = pb_url_file,
- };
+};
+
+static const struct pb_scheme_info *file_scheme = &schemes[0];
+
+/**
+ * pb_url_find_scheme - Find the pb_scheme_info for a URL string.
+ */
+
+static const struct pb_scheme_info *pb_url_find_scheme(const char *url_str)
+{
unsigned int i;
- for (i = 0; i < sizeof(a) / sizeof(a[0]); i++)
- if (!strncasecmp(url_str, a[i].str, a[i].str_len))
- return &a[i];
+ for (i = 0; i < sizeof(schemes) / sizeof(schemes[0]); i++)
+ if (!strncasecmp(url_str, schemes[i].str, schemes[i].str_len))
+ return &schemes[i];
/* Assume this is a non-url local file. */
- return &file_scheme;
+ return file_scheme;
}
/**
OpenPOWER on IntegriCloud