[svn] Split off non-URL related stuff from url.c to convert.c.

[wget] / src / url.h

diff --git a/src/url.h b/src/url.h
index 5cf9e4f6aee096691a2e835b7ee8eb780d6ff5f6..750f3f5cda6815606c046b185632a6514817e1b3 100644 (file)
--- a/src/url.h
+++ b/src/url.h
@@ -71,63 +71,6 @@ struct url
   char *passwd;
 };
 
-enum convert_options {
-  CO_NOCONVERT = 0,            /* don't convert this URL */
-  CO_CONVERT_TO_RELATIVE,      /* convert to relative, e.g. to
-                                   "../../otherdir/foo.gif" */
-  CO_CONVERT_TO_COMPLETE,      /* convert to absolute, e.g. to
-                                  "http://orighost/somedir/bar.jpg". */
-  CO_NULLIFY_BASE              /* change to empty string. */
-};
-
-/* A structure that defines the whereabouts of a URL, i.e. its
-   position in an HTML document, etc.  */
-
-struct urlpos {
-  struct url *url;             /* the URL of the link, after it has
-                                  been merged with the base */
-  char *local_name;            /* local file to which it was saved
-                                  (used by convert_links) */
-
-  /* reserved for special links such as <base href="..."> which are
-     used when converting links, but ignored when downloading.  */
-  unsigned int ignore_when_downloading :1;
-
-  /* Information about the original link: */
-
-  unsigned int link_relative_p :1; /* was the link relative? */
-  unsigned int link_complete_p :1; /* was the link complete (with the
-                                      host name, etc.) */
-  unsigned int link_base_p     :1; /* was the link <base href=...> */
-  unsigned int link_inline_p   :1; /* needed to render the page. */
-
-  unsigned int link_refresh_p  :1; /* link was received from
-                                      <meta http-equiv=refresh content=...> */
-  int refresh_timeout;         /* for reconstructing the refresh. */
-
-  /* Conversion requirements: */
-  enum convert_options convert;        /* is conversion required? */
-
-  /* URL's position in the buffer. */
-  int pos, size;
-
-  struct urlpos *next;         /* next list element */
-};
-
-/* downloaded_file() takes a parameter of this type and returns this type. */
-typedef enum
-{
-  /* Return enumerators: */
-  FILE_NOT_ALREADY_DOWNLOADED = 0,
-
-  /* Return / parameter enumerators: */
-  FILE_DOWNLOADED_NORMALLY,
-  FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
-
-  /* Parameter enumerators: */
-  CHECK_FOR_FILE
-} downloaded_file_t;
-
 /* Function declarations */
 
 char *url_escape PARAMS ((const char *));
@@ -145,26 +88,13 @@ int scheme_default_port PARAMS ((enum url_scheme));
 void scheme_disable PARAMS ((enum url_scheme));
 
 char *url_string PARAMS ((const struct url *, int));
-
-struct urlpos *get_urls_file PARAMS ((const char *));
-struct urlpos *get_urls_html PARAMS ((const char *, const char *, int *));
-void free_urlpos PARAMS ((struct urlpos *));
+char *url_file_name PARAMS ((const struct url *));
 
 char *uri_merge PARAMS ((const char *, const char *));
 
-void rotate_backups PARAMS ((const char *));
 int mkalldirs PARAMS ((const char *));
-char *url_file_name PARAMS ((const struct url *));
-
-char *getproxy PARAMS ((struct url *));
-int no_proxy_match PARAMS ((const char *, const char **));
-
-void convert_links PARAMS ((const char *, struct urlpos *));
-
-downloaded_file_t downloaded_file PARAMS ((downloaded_file_t, const char *));
 
 char *rewrite_shorthand_url PARAMS ((const char *));
-
 int schemes_are_similar_p PARAMS ((enum url_scheme a, enum url_scheme b));
 
 #endif /* URL_H */