move lib functions to lib.h Reference: /n/atom/patch/applied2013/fsportlib Date: Wed Oct 2 16:41:02 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/port/lib.h Wed Oct 2 16:40:04 2013 +++ /sys/src/fs/port/lib.h Wed Oct 2 16:40:04 2013 @@ -3,6 +3,7 @@ */ #define nelem(x) (sizeof(x)/sizeof((x)[0])) #define offsetof(s, m) (ulong)(&(((s*)0)->m)) +#define assert(x) if(x){}else _assert("x") /* * mem routines @@ -48,11 +49,6 @@ extern int runelen(long); /* - * math - */ -extern int abs(int); - -/* * print routines */ enum{ @@ -140,9 +136,22 @@ #pragma varargck type "lH" void* /* + * math + */ +extern int abs(int); + +/* + * endian conversion + */ +extern uvlong getbe(uchar*, int); +extern void putbe(uchar*, uvlong, int); +extern uvlong getle(uchar*, int); +extern void putle(uchar*, uvlong, int); + +/* * one-of-a-kind */ -#define assert(x) if(x){}else _assert("x") +void _assert(char*); int getfields(char*, char**, int, int, char*); int tokenize(char*, char**, int); int gettokens(char *, char **, int, char *); @@ -150,6 +159,9 @@ int decrypt(void*, void*, int); int encrypt(void*, void*, int); int nrand(int); +vlong strtoll(char *, char **, int); +uvlong strtoull(char *, char **, int); +ulong strtoul(char*, char**, int); void srand(long); extern char end[]; --- /sys/src/fs/port/portfns.h Wed Oct 2 16:40:05 2013 +++ /sys/src/fs/port/portfns.h Wed Oct 2 16:40:06 2013 @@ -4,7 +4,6 @@ void archmach0init(Mach*); void arginit(void); void arpstart(void); -void _assert(char*); void atexit(void (*)(void*), void*); char* authaname(Auth*); void authfree(Auth*); @@ -254,12 +253,10 @@ int syncblock(void); void sync(char*); void synccopy(void); -long syscall(Ureg*); void sysinit(void); int tfmt(Fmt*); Timet time(void); Tlock* tlocked(Iobuf*, Dentry*); -int tokenize(char*, char**, int); void touser(void); Timet toytime(void); void tsleep(Rendez*, int(*)(void*), void*, int); @@ -294,10 +291,6 @@ long nhgetl(uchar*); void hnputs(uchar*, int); void hnputl(uchar*, long); - -vlong strtoll(char *, char **, int); -uvlong strtoull(char *, char **, int); -ulong strtoul(char*, char**, int); #define NEXT(x, l) (((x)+1)%(l)) #define PREV(x, l) (((x) == 0) ? (l)-1: (x)-1)