mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-02 01:04:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

nsurl: Split internal structure out into private header.

Browse Source
This commit is contained in:
Michael Drake 2017-01-15 13:48:11 +00:00
parent 299a85fa7a
commit 4c47f9c046
2 changed files with 77 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
utils/nsurl/nsurl.c
View File

@ -42,62 +42,13 @@
#include "utils/errors.h"
#include "utils/idna.h"
#include "utils/log.h"
#include "utils/nsurl/private.h"
#include "utils/nsurl.h"
#include "utils/utils.h"
/* Define to enable NSURL debugging */
#undef NSURL_DEBUG
/**
* nsurl scheme type
*/
enum scheme_type {
NSURL_SCHEME_OTHER,
NSURL_SCHEME_HTTP,
NSURL_SCHEME_HTTPS,
NSURL_SCHEME_FTP,
NSURL_SCHEME_MAILTO
};
/**
* nsurl components
*
* [scheme]://[username]:[password]@[host]:[port][path][?query]#[fragment]
*
* Note:
* "path" string includes preceding '/', if needed for the scheme
* "query" string always includes preceding '?'
*
* The other spanned punctuation is to be inserted when building URLs from
* components.
*/
struct nsurl_components {
lwc_string *scheme;
lwc_string *username;
lwc_string *password;
lwc_string *host;
lwc_string *port;
lwc_string *path;
lwc_string *query;
lwc_string *fragment;
enum scheme_type scheme_type;
};
/**
* NetSurf URL object
*/
struct nsurl {
struct nsurl_components components;
int count; /* Number of references to NetSurf URL object */
uint32_t hash; /* Hash value for nsurl identification */
size_t length; /* Length of string */
char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
};
/** Marker set, indicating positions of sections within a URL string */
struct url_markers {
@ -115,7 +66,7 @@ struct url_markers {
size_t end; /** end of URL */
enum scheme_type scheme_type;
enum nsurl_scheme_type scheme_type;
};

75
utils/nsurl/private.h Normal file
View File

@ -0,0 +1,75 @@
/*
* Copyright 2011-2017 Michael Drake <tlsa@netsurf-browser.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef NETSURF_UTILS_NSURL_PRIVATE_H_
#define NETSURF_UTILS_NSURL_PRIVATE_H_
#include <libwapcaplet/libwapcaplet.h>
#include "utils/utils.h"
/** A type for URL schemes */
enum nsurl_scheme_type {
NSURL_SCHEME_OTHER,
NSURL_SCHEME_HTTP,
NSURL_SCHEME_HTTPS,
NSURL_SCHEME_FTP,
NSURL_SCHEME_MAILTO
};
/**
* nsurl components
*
* [scheme]://[username]:[password]@[host]:[port][path][?query]#[fragment]
*
* Note:
* "path" string includes preceding '/', if needed for the scheme
* "query" string always includes preceding '?'
*
* The other spanned punctuation is to be inserted when building URLs from
* components.
*/
struct nsurl_components {
lwc_string *scheme;
lwc_string *username;
lwc_string *password;
lwc_string *host;
lwc_string *port;
lwc_string *path;
lwc_string *query;
lwc_string *fragment;
enum nsurl_scheme_type scheme_type;
};
/**
* NetSurf URL object
*/
struct nsurl {
struct nsurl_components components;
int count; /* Number of references to NetSurf URL object */
uint32_t hash; /* Hash value for nsurl identification */
size_t length; /* Length of string */
char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */
};
#endif