libc: use usize for sbrk() increment

[plan9front.git] / sys / include / 9p.h

diff --git a/sys/include/9p.h b/sys/include/9p.h
index 22d64c57f97b43ff8aadc80b634637d0838d0534..bfbe0d7ec73320b1b6c1aa583c16169bd9911f53 100644 (file)
--- a/sys/include/9p.h
+++ b/sys/include/9p.h
@@ -152,7 +152,6 @@ struct Tree {
 /* below is implementation-specific; don't use */
        Lock genlock;
        ulong qidgen;
-       ulong dirqidgen;
 };
 
 Tree*  alloctree(char*, char*, ulong, void(*destroy)(File*));
@@ -162,7 +161,7 @@ int         removefile(File*);
 void           closefile(File*);
 File*          walkfile(File*, char*);
 Readdir*       opendirfile(File*);
-long           readdirfile(Readdir*, uchar*, long);
+long           readdirfile(Readdir*, uchar*, long, long);
 void           closedirfile(Readdir*);
 
 /*
@@ -215,9 +214,6 @@ struct Srv {
 
        int             infd;
        int             outfd;
-       int             nopipe;
-       int             srvfd;
-       int             leavefdsopen;   /* magic for acme win */
        char*   keyspec;
 
 /* below is implementation-specific; don't use */
@@ -238,25 +234,29 @@ struct Srv {
 
        int     spid;   /* pid of srv() caller */
 
+       void    (*forker)(void (*)(void*), void*, int);
        void    (*free)(Srv*);
 };
 
+void           srvforker(void (*)(void*), void*, int);
+void           threadsrvforker(void (*)(void*), void*, int);
+
 void           srv(Srv*);
+int            postsrv(Srv*, char*);
 void           postmountsrv(Srv*, char*, char*, int);
-void           _postmountsrv(Srv*, char*, char*, int);
 void           postsharesrv(Srv*, char*, char*, char*);
-void           _postsharesrv(Srv*, char*, char*, char*);
 void           listensrv(Srv*, char*);
-void           _listensrv(Srv*, char*);
-int            postfd(char*, int);
-int            sharefd(char*, char*, int);
-int            chatty9p;
-void           respond(Req*, char*);
-void           responderror(Req*);
+
+void           threadsrv(Srv*);
+int            threadpostsrv(Srv*, char*);
 void           threadpostmountsrv(Srv*, char*, char*, int);
 void           threadpostsharesrv(Srv*, char*, char*, char*);
 void           threadlistensrv(Srv *s, char *addr);
 
+int            chatty9p;
+void           respond(Req*, char*);
+void           responderror(Req*);
+
 /*
  * Helper.  Assumes user is same as group.
  */
@@ -281,8 +281,6 @@ void                authwrite(Req*);
 void           authdestroy(Fid*);
 int            authattach(Req*);
 
-extern void (*_forker)(void (*)(void*), void*, int);
-
 void           srvacquire(Srv *);
 void           srvrelease(Srv *);