uhttpd: rename struct uh_path_info to path_info, drop wdir member

[project/luci.git] / contrib / package / uhttpd / src / uhttpd-utils.h

diff --git a/contrib/package/uhttpd/src/uhttpd-utils.h b/contrib/package/uhttpd/src/uhttpd-utils.h
index 01b95af..7d4bcf6 100644 (file)
--- a/contrib/package/uhttpd/src/uhttpd-utils.h
+++ b/contrib/package/uhttpd/src/uhttpd-utils.h
@@ -1,3 +1,21 @@
+/*
+ * uhttpd - Tiny non-forking httpd - Utility header
+ *
+ *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 #ifndef _UHTTPD_UTILS_
 
 #include <stdarg.h>
@@ -13,9 +31,8 @@
 #define foreach_header(i, h) \
        for( i = 0; (i + 1) < (sizeof(h) / sizeof(h[0])) && h[i]; i += 2 )
 
-struct uh_path_info {
+struct path_info {
        char *root;
-       char *wdir;
        char *phys;
        char *name;
        char *info;
@@ -56,7 +73,7 @@ int uh_urldecode(char *buf, int blen, const char *src, int slen);
 int uh_urlencode(char *buf, int blen, const char *src, int slen);
 int uh_path_normalize(char *buf, int blen, const char *src, int slen);
 
-struct uh_path_info * uh_path_lookup(struct client *cl, const char *url);
+struct path_info * uh_path_lookup(struct client *cl, const char *url);
 
 struct listener * uh_listener_add(int sock, struct config *conf);
 struct listener * uh_listener_lookup(int sock);