[Winpt-commits] r186 - trunk/Include

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2006-03-20 13:49:11 +0100 (Mon, 20 Mar 2006)
New Revision: 186

Modified:
   trunk/Include/wptKeyserver.h
   trunk/Include/wptUTF8.h
Log:


Modified: trunk/Include/wptKeyserver.h
===================================================================
--- trunk/Include/wptKeyserver.h	2006-03-20 12:48:52 UTC (rev 185)
+++ trunk/Include/wptKeyserver.h	2006-03-20 12:49:11 UTC (rev 186)
@@ -29,7 +29,8 @@
 
 /* Valid proxy protocols. */
 enum proxy_proto_t {
-    PROXY_PROTO_HTTP = 0,
+    PROXY_PROTO_NONE = 0,
+    PROXY_PROTO_HTTP,
     PROXY_PROTO_SOCKS4,
     PROXY_PROTO_SOCKS5
 };
@@ -115,10 +116,10 @@
 int kserver_recvkey (const char *hostname, WORD port, 
 		     const char *keyid, char *key, int maxkeylen);
 
-int kserver_search_init(const char *hostname, WORD port, 
-			const char *keyid, int *conn_fd);
-int kserver_search_chkresp (int conn_fd);
-int kserver_search (int conn_fd, keyserver_key *key);
+int kserver_search_begin (const char *hostname, WORD port, 
+			  const char *pattern, int *conn_fd);
+int kserver_search_next (int conn_fd, keyserver_key *key);
+void kserver_search_end (int conn_fd);
 
 /*-- Finger/LDAP Protocol --*/
 int  ldap_recvkey (const char *hostname, const char *keyid, char *key, 

Modified: trunk/Include/wptUTF8.h
===================================================================
--- trunk/Include/wptUTF8.h	2006-03-20 12:48:52 UTC (rev 185)
+++ trunk/Include/wptUTF8.h	2006-03-20 12:49:11 UTC (rev 186)
@@ -21,10 +21,8 @@
 #ifndef WPT_UTF8_H
 #define WPT_UTF8_H
 
-int set_native_charset (const char *newset);
-const char* get_native_charset (void);
 int is_8bit_string (const char *str);
-char *wincp_to_utf8 (const char *s, size_t len); 
+char *wincp_to_utf8 (const char *s, size_t len);
 char *utf8_to_wincp (const char *s, size_t len);
 #define utf8_to_wincp2(encstr) utf8_to_wincp ((encstr), strlen (encstr))