Mercurial > hg > webserver / file diff

--- a/src/server/public/nsapi.h	Sat Jan 28 16:01:07 2012 +0100
+++ b/src/server/public/nsapi.h	Mon Feb 13 13:49:49 2012 +0100
@@ -751,13 +751,17 @@
 /*
  * Function prototypes for filter methods
  */
-typedef int (FilterInsertFunc)(FilterLayer *layer, pblock *pb);
-typedef void (FilterRemoveFunc)(FilterLayer *layer);
-typedef int (FilterFlushFunc)(FilterLayer *layer);
-typedef int (FilterReadFunc)(FilterLayer *layer, void *buf, int amount, int timeout);
-typedef int (FilterWriteFunc)(FilterLayer *layer, const void *buf, int amount);
-typedef int (FilterWritevFunc)(FilterLayer *layer, const NSAPIIOVec *iov, int iov_size);
-typedef int (FilterSendfileFunc)(FilterLayer *layer, sendfiledata *sfd);
+
+/*
+ * TODO: modified: added * bevor Filter...Func
+ */
+typedef int (*FilterInsertFunc)(FilterLayer *layer, pblock *pb);
+typedef void (*FilterRemoveFunc)(FilterLayer *layer);
+typedef int (*FilterFlushFunc)(FilterLayer *layer);
+typedef int (*FilterReadFunc)(FilterLayer *layer, void *buf, int amount, int timeout);
+typedef int (*FilterWriteFunc)(FilterLayer *layer, const void *buf, int amount);
+typedef int (*FilterWritevFunc)(FilterLayer *layer, const NSAPIIOVec *iov, int iov_size);
+typedef int (*FilterSendfileFunc)(FilterLayer *layer, sendfiledata *sfd);
 
 /*
  * FilterMethods is passed to filter_create() to declare the filter methods for
@@ -1266,12 +1270,6 @@
 NSAPI_PUBLIC char *session_dns_lookup(Session *s, int verify);
 
 
-/* --- OBSOLETE ----------------------------------------------------------
- * The following macros/functions are obsolete and are only maintained for
- * compatibility.  Do not use them.
- * -----------------------------------------------------------------------
- */
-
 
 /* new macro and function definitions begin */
 
@@ -1289,6 +1287,15 @@
 
 NSAPI_PUBLIC int netbuf_grab(netbuf *buf, int sz);
 
+#define netbuf_open        netbuf_open
+#define netbuf_close       netbuf_close
+#define netbuf_replace     netbuf_replace
+#define netbuf_next        netbuf_next
+#define netbuf_getbytes    netbuf_getbytes
+#define netbuf_grab        netbuf_grab
+
+
+
 /* end new macro and function definitions */
 
 #define SYS_STDERR STDERR_FILENO