From: Pavel Charvat <pchar@ucw.cz>
Date: Thu, 30 Oct 2008 09:14:30 +0000 (+0100)
Subject: identify_protocol -> url_identify_protocol
X-Git-Tag: holmes-import~234
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=332dec49a16b44389e66f3cbc7e0f08f98657ad8;p=libucw.git

identify_protocol -> url_identify_protocol
---

diff --git a/ucw/url.c b/ucw/url.c
index 7145af5f..c05bae66 100644
--- a/ucw/url.c
+++ b/ucw/url.c
@@ -184,7 +184,7 @@ char *url_proto_names[URL_PROTO_MAX] = URL_PNAMES;
 static int url_proto_path_flags[URL_PROTO_MAX] = URL_PATH_FLAGS;
 
 uns
-identify_protocol(const char *p)
+url_identify_protocol(const char *p)
 {
   uns i;
 
@@ -212,7 +212,7 @@ url_split(char *s, struct url *u, char *d)
 	  while (s < p)
 	    *d++ = *s++;
 	  *d++ = 0;
-	  u->protoid = identify_protocol(u->protocol);
+	  u->protoid = url_identify_protocol(u->protocol);
 	  s++;
 	  if (url_proto_path_flags[u->protoid] && (s[0] != '/' || s[1] != '/'))
 	    {
@@ -512,7 +512,7 @@ url_pack(struct url *u, char *d)
     {
       d = append(d, u->protocol, e);
       d = append(d, ":", e);
-      u->protoid = identify_protocol(u->protocol);
+      u->protoid = url_identify_protocol(u->protocol);
     }
   if (u->host)
     {
diff --git a/ucw/url.h b/ucw/url.h
index aee20715..d2689be5 100644
--- a/ucw/url.h
+++ b/ucw/url.h
@@ -59,7 +59,7 @@ int url_canonicalize(struct url *u);
 int url_pack(struct url *u, char *d);
 int url_canon_split_rel(const char *url, char *buf1, char *buf2, struct url *u, struct url *base);
 int url_auto_canonicalize_rel(const char *src, char *dst, struct url *base);
-uns identify_protocol(const char *p);
+uns url_identify_protocol(const char *p);
 int url_has_repeated_component(const char *url);
 
 static inline int url_canon_split(const char *url, char *buf1, char *buf2, struct url *u)